RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-31 02:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: stats: only report backend's down time if it has servers

Browse Source 
There's no point in reporting a backend's up/down time if it has no
servers. The CSV output used to report "0" for a serverless backend
while the HTML version already removed the field. For servers, this
field is already omitted if checks are disabled. Let's uniformize
all of this and remove the field in CSV as well when irrelevant.
This commit is contained in:
Willy Tarreau 2016-01-11 12:04:02 +01:00
parent 8a8cce1f87
commit 7344f47893
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dumpstats.c
View File

@ -4091,7 +4091,9 @@ static int stats_dump_be_stats(struct stream_interface *si, struct proxy *px, in
stats[ST_F_BCK] = mkf_u32(0, px->srv_bck);
stats[ST_F_CHKDOWN] = mkf_u64(FN_COUNTER, px->down_trans);
stats[ST_F_LASTCHG] = mkf_u32(FN_AGE, now.tv_sec - px->last_change);
stats[ST_F_DOWNTIME] = mkf_u32(FN_COUNTER, px->srv ? be_downtime(px) : 0);
if (px->srv)
stats[ST_F_DOWNTIME] = mkf_u32(FN_COUNTER, be_downtime(px));
stats[ST_F_PID] = mkf_u32(FO_KEY, relative_pid);
stats[ST_F_IID] = mkf_u32(FO_KEY|FS_SERVICE, px->uuid);
stats[ST_F_SID] = mkf_u32(FO_KEY|FS_SERVICE, 0);
@ -4275,7 +4277,7 @@ static int stats_dump_be_stats(struct stream_interface *si, struct proxy *px, in
"<td></td>"
"</tr>",
stats[ST_F_CHKDOWN].u.u32,
px->srv ? human_time(stats[ST_F_DOWNTIME].u.u32, 1) : "&nbsp;");
stats[ST_F_DOWNTIME].type ? human_time(stats[ST_F_DOWNTIME].u.u32, 1) : "&nbsp;");
}
else { /* CSV mode */
/* dump everything */