From: Willy Tarreau <w@1wt.eu>
Date: Thu, 25 Mar 2010 05:45:07 +0000 (+0100)
Subject: [MINOR] cli: "show errors" should display "backend <NONE>" when backend was not used
X-Git-Tag: v1.4.3~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fd6cec5f65ea20c07512f88b13e13ed2a60d87d;p=thirdparty%2Fhaproxy.git

[MINOR] cli: "show errors" should display "backend <NONE>" when backend was not used

It was disturbing to see a backend name associated with a bad request
when this "backend" was in fact the frontend. Instead, we now display
"backend <NONE>" if the "backend" has no backend capability :

> show errors

[25/Mar/2010:06:44:25.394] frontend fe (#1): invalid request
  src 127.0.0.1, session #0, backend <NONE> (#-1), server <NONE> (#-1)
  request length 45 bytes, error at position 0:
---

diff --git a/src/dumpstats.c b/src/dumpstats.c
index 71a323cb34..15174b81e2 100644
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -2860,7 +2860,8 @@ int stats_dump_errors_to_buffer(struct session *s, struct buffer *rep)
 					     "  src %s, session #%d, backend %s (#%d), server %s (#%d)\n"
 					     "  request length %d bytes, error at position %d:\n \n",
 					     s->data_ctx.errors.px->id, s->data_ctx.errors.px->uuid,
-					     pn, es->sid, es->oe->id, es->oe->uuid,
+					     pn, es->sid, (es->oe->cap & PR_CAP_BE) ? es->oe->id : "<NONE>",
+					     (es->oe->cap & PR_CAP_BE) ? es->oe->uuid : -1,
 					     es->srv ? es->srv->id : "<NONE>",
 					     es->srv ? es->srv->puid : -1,
 					     es->len, es->pos);