RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-01 17:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MINOR] stats: display "<NONE>" instead of the frontend name when unknown

Browse Source 
"show sess" should display "<NONE>" instead of the frontend's name as
the backend's.
This commit is contained in:
Willy Tarreau 2011-09-02 17:33:05 +02:00
parent 588bd4f813
commit 509433391a
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/dumpstats.c
View 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->name ? sess->listener->name : "?" : "?",
sess->listener ? sess->listener->luid : 0); sess->listener ? sess->listener->luid : 0);
if (sess->be->cap & PR_CAP_BE)
chunk_printf(&msg, chunk_printf(&msg,
" backend=%s (id=%u mode=%s) server=%s (id=%u)\n", " backend=%s (id=%u mode=%s) server=%s (id=%u)\n",
sess->be->id, sess->be->uuid, sess->be->mode ? "http" : "tcp", 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)->id : "<none>",
target_srv(&sess->target) ? target_srv(&sess->target)->puid : 0); 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, chunk_printf(&msg,
" task=%p (state=0x%02x nice=%d calls=%d exp=%s%s)\n", " 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, pn,
get_host_port(&curr_sess->si[0].addr.c.from), get_host_port(&curr_sess->si[0].addr.c.from),
curr_sess->fe->id, 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>" target_srv(&curr_sess->target) ? target_srv(&curr_sess->target)->id : "<none>"
); );
break; 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", " src=unix:%d fe=%s be=%s srv=%s",
curr_sess->listener->luid, curr_sess->listener->luid,
curr_sess->fe->id, 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>" target_srv(&curr_sess->target) ? target_srv(&curr_sess->target)->id : "<none>"
); );
break; break;