From 509433391a434c7354ce0827b60dbd0ce340850c Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 2 Sep 2011 17:33:05 +0200 Subject: [PATCH] [MINOR] stats: display "" instead of the frontend name when unknown "show sess" should display "" instead of the frontend's name as the backend's. --- src/dumpstats.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/dumpstats.c b/src/dumpstats.c index 95bcd4c3d..746709b80 100644 --- a/src/dumpstats.c +++ b/src/dumpstats.c @@ -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 : "", - 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 : "", + target_srv(&sess->target) ? target_srv(&sess->target)->puid : 0); + else + chunk_printf(&msg, " backend= (id=-1 mode=-) server= (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 : "", target_srv(&curr_sess->target) ? target_srv(&curr_sess->target)->id : "" ); 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 : "", target_srv(&curr_sess->target) ? target_srv(&curr_sess->target)->id : "" ); break;