From ce1dd4405556a6725d15321a84cc02124f95b821 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 8 Jan 2016 09:48:26 +0100 Subject: [PATCH] MINOR: stats: make HTML stats dump rely on the table for the check status We can now check that the check status field is present to know that a check is enabled. --- src/dumpstats.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dumpstats.c b/src/dumpstats.c index fce8d90a3f..b7b568062b 100644 --- a/src/dumpstats.c +++ b/src/dumpstats.c @@ -3946,7 +3946,7 @@ static int stats_dump_sv_stats(struct stream_interface *si, struct proxy *px, in chunk_appendf(&trash, "%s ", human_time(stats[ST_F_LASTCHG].u.u32, 1)); chunk_appendf(&trash, srv_hlt_st[1], "GCC: your -Werror=format-security is bogus, annoying, and hides real bugs, I don't thank you, really!"); } - else if (ref->check.state & CHK_ST_ENABLED) { + else if (stats[ST_F_CHECK_STATUS].type) { chunk_appendf(&trash, "%s ", human_time(stats[ST_F_LASTCHG].u.u32, 1)); chunk_appendf(&trash, srv_hlt_st[state], @@ -3976,7 +3976,7 @@ static int stats_dump_sv_stats(struct stream_interface *si, struct proxy *px, in } chunk_appendf(&trash, ""); } - else if ((sv->check.state & (CHK_ST_ENABLED|CHK_ST_PAUSED)) == CHK_ST_ENABLED) { + else if (stats[ST_F_CHECK_STATUS].type) { chunk_appendf(&trash, " %s", field_str(stats, ST_F_CHECK_STATUS)); -- 2.47.3