commit b167b6bff979272f1290229b694b8ca91c8d8d69
author Simon Horman <horms@verge.net.au> Thu Apr 23 14:51:29 2015 +0900
committer Willy Tarreau <w@1wt.eu> Thu Apr 23 09:57:56 2015 +0200
tree e5ac48ab8f8139fd0633d0b141cfc9d55207bdf8
parent 4463d19d4889169c457189fe32bb06160a346355

MEDIUM: stats: Differentiate between DRAIN and DRAIN (agent)

Differentiate between DRAIN and DRAIN (agent) when reporting stats.
This is consistent with the distinction made between DOWN and DOWN (agent).

Signed-off-by: Simon Horman <horms@verge.net.au>

src/dumpstats.c

diff --git a/src/dumpstats.c b/src/dumpstats.c
index 5704fe4..095371f 100644
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -2929,6 +2929,7 @@
 	SRV_STATS_STATE_NOLB,
 	SRV_STATS_STATE_DRAIN_GOING_DOWN,
 	SRV_STATS_STATE_DRAIN,
+	SRV_STATS_STATE_DRAIN_AGENT,
 	SRV_STATS_STATE_NO_CHECK,
 
 	SRV_STATS_STATE_COUNT, /* Must be last */
@@ -2989,6 +2990,7 @@
 			[SRV_STATS_STATE_NOLB]			= "NOLB",
 			[SRV_STATS_STATE_DRAIN_GOING_DOWN]	= "DRAIN %d/%d ↓",
 			[SRV_STATS_STATE_DRAIN]			= "DRAIN",
+			[SRV_STATS_STATE_DRAIN_AGENT]		= "DRAIN (agent)",
 			[SRV_STATS_STATE_NO_CHECK]		= "<i>no check</i>",
 		};
 
@@ -3243,6 +3245,7 @@
 			[SRV_STATS_STATE_NOLB]			= "NOLB,",
 			[SRV_STATS_STATE_DRAIN_GOING_DOWN]	= "DRAIN %d/%d,",
 			[SRV_STATS_STATE_DRAIN]			= "DRAIN,",
+			[SRV_STATS_STATE_DRAIN_AGENT]		= "DRAIN (agent)",
 			[SRV_STATS_STATE_NO_CHECK]		= "no check,"
 		};
 
@@ -3910,7 +3913,9 @@
 					sv_colour = SRV_STATS_COLOUR_DRAINING;
 
 				if (sv->admin & SRV_ADMF_DRAIN) {
-					if (sv_state == SRV_STATS_STATE_UP_GOING_DOWN)
+					if (svs->agent.state & CHK_ST_ENABLED)
+						sv_state = SRV_STATS_STATE_DRAIN_AGENT;
+					else if (sv_state == SRV_STATS_STATE_UP_GOING_DOWN)
 						sv_state = SRV_STATS_STATE_DRAIN_GOING_DOWN;
 					else
 						sv_state = SRV_STATS_STATE_DRAIN;