From 03fb1c57b564842110a4c696d50301b4d1951ba8 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 8 Jan 2016 09:43:54 +0100 Subject: [PATCH] MINOR: stats: prepend '*' in front of the check status when in progress The HTML version already does this, but the CSV doesn't provide this status, so make both of them report the same status. --- src/dumpstats.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/dumpstats.c b/src/dumpstats.c index c2a2c55..fce8d90 100644 --- a/src/dumpstats.c +++ b/src/dumpstats.c @@ -3733,7 +3733,10 @@ static int stats_dump_sv_stats(struct stream_interface *si, struct proxy *px, in const char *fld_chksts; fld_chksts = chunk_newstr(out); + chunk_strcat(out, "* "); // for check in progress chunk_strcat(out, get_check_status_info(sv->check.status)); + if (!(sv->check.state & CHK_ST_INPROGRESS)) + fld_chksts += 2; // skip "* " stats[ST_F_CHECK_STATUS] = mkf_str(FN_OUTPUT, fld_chksts); if (sv->check.status >= HCHK_STATUS_L57DATA) @@ -3975,8 +3978,7 @@ static int stats_dump_sv_stats(struct stream_interface *si, struct proxy *px, in } else if ((sv->check.state & (CHK_ST_ENABLED|CHK_ST_PAUSED)) == CHK_ST_ENABLED) { chunk_appendf(&trash, - " %s%s", - (sv->check.state & CHK_ST_INPROGRESS) ? "* " : "", + " %s", field_str(stats, ST_F_CHECK_STATUS)); if (stats[ST_F_CHECK_CODE].type) -- 1.7.10.4