From: Willy Tarreau <w@1wt.eu>
Date: Fri, 8 Jan 2016 08:43:54 +0000 (+0100)
Subject: MINOR: stats: prepend '*' in front of the check status when in progress
X-Git-Tag: v1.7-dev2~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03fb1c57b564842110a4c696d50301b4d1951ba8;p=thirdparty%2Fhaproxy.git

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.
---

diff --git a/src/dumpstats.c b/src/dumpstats.c
index c2a2c55028..fce8d90a3f 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,
-			              "</td><td class=ac><u> %s%s",
-			              (sv->check.state & CHK_ST_INPROGRESS) ? "* " : "",
+			              "</td><td class=ac><u> %s",
 			              field_str(stats, ST_F_CHECK_STATUS));
 
 			if (stats[ST_F_CHECK_CODE].type)