]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
[MINOR] stats: display "<NONE>" instead of the frontend name when unknown
authorWilly Tarreau <w@1wt.eu>
Fri, 2 Sep 2011 15:33:05 +0000 (17:33 +0200)
committerWilly Tarreau <w@1wt.eu>
Sun, 4 Sep 2011 22:54:56 +0000 (00:54 +0200)
"show sess" should display "<NONE>" instead of the frontend's name as
the backend's.

src/dumpstats.c

index 95bcd4c3d134f205f42f26e6b67c65d541f6d915..746709b80c732e861f99361f182972c4aa80b134 100644 (file)
@@ -3016,11 +3016,15 @@ static int stats_dump_full_sess_to_buffer(struct stream_interface *si)
                             sess->listener ? sess->listener->name ? sess->listener->name : "?" : "?",
                             sess->listener ? sess->listener->luid : 0);
 
-               chunk_printf(&msg,
-                            "  backend=%s (id=%u mode=%s) server=%s (id=%u)\n",
-                            sess->be->id, sess->be->uuid, sess->be->mode ? "http" : "tcp",
-                            target_srv(&sess->target) ? target_srv(&sess->target)->id : "<none>",
-                            target_srv(&sess->target) ? target_srv(&sess->target)->puid : 0);
+               if (sess->be->cap & PR_CAP_BE)
+                       chunk_printf(&msg,
+                                    "  backend=%s (id=%u mode=%s) server=%s (id=%u)\n",
+                                    sess->be->id,
+                                    sess->be->uuid, sess->be->mode ? "http" : "tcp",
+                                    target_srv(&sess->target) ? target_srv(&sess->target)->id : "<none>",
+                                    target_srv(&sess->target) ? target_srv(&sess->target)->puid : 0);
+               else
+                       chunk_printf(&msg, "  backend=<NONE> (id=-1 mode=-) server=<NONE> (id=-1)\n");
 
                chunk_printf(&msg,
                             "  task=%p (state=0x%02x nice=%d calls=%d exp=%s%s)\n",
@@ -3223,7 +3227,7 @@ static int stats_dump_sess_to_buffer(struct stream_interface *si)
                                             pn,
                                             get_host_port(&curr_sess->si[0].addr.c.from),
                                             curr_sess->fe->id,
-                                            curr_sess->be->id,
+                                            (curr_sess->be->cap & PR_CAP_BE) ? curr_sess->be->id : "<NONE>",
                                             target_srv(&curr_sess->target) ? target_srv(&curr_sess->target)->id : "<none>"
                                             );
                                break;
@@ -3232,7 +3236,7 @@ static int stats_dump_sess_to_buffer(struct stream_interface *si)
                                             " src=unix:%d fe=%s be=%s srv=%s",
                                             curr_sess->listener->luid,
                                             curr_sess->fe->id,
-                                            curr_sess->be->id,
+                                            (curr_sess->be->cap & PR_CAP_BE) ? curr_sess->be->id : "<NONE>",
                                             target_srv(&curr_sess->target) ? target_srv(&curr_sess->target)->id : "<none>"
                                             );
                                break;