From b16a607997f09a4a88d9a74d3b56bfc55c08c288 Mon Sep 17 00:00:00 2001 From: Krzysztof Piotr Oledzki Date: Sun, 10 Jan 2010 21:12:58 +0100 Subject: [PATCH] [BUG] health checks: fix requeued message Dummy copy&past is not a good idea. :( Also, we shoud check "s->state & SRV_RUNNING" instead of xferred. --- src/checks.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/checks.c b/src/checks.c index b6f73bd30..d61b6bbc1 100644 --- a/src/checks.c +++ b/src/checks.c @@ -174,7 +174,7 @@ static void server_status_printf(struct chunk *msg, struct server *s, unsigned o } if (options & SSP_O_STATUS) { - if (xferred) + if (!(s->state & SRV_RUNNING)) chunk_printf(msg, ". %d active and %d backup servers left.%s" " %d sessions active, %d requeued, %d remaining in queue.\n", s->proxy->srv_act, s->proxy->srv_bck, @@ -458,7 +458,7 @@ static void set_server_up(struct server *s) { server_status_printf(&msg, s, (s->tracked?SSP_O_VIA:0) | SSP_O_STATUS | ((!s->tracked && !(s->proxy->options2 & PR_O2_LOGHCHKS))?SSP_O_HCHK:0), - -1); + xferred); Warning("%s", trash); send_log(s->proxy, LOG_NOTICE, "%s", trash); @@ -498,7 +498,7 @@ static void set_server_disabled(struct server *s) { server_status_printf(&msg, s, (s->tracked?SSP_O_VIA:0) | SSP_O_STATUS | ((!s->tracked && !(s->proxy->options2 & PR_O2_LOGHCHKS))?SSP_O_HCHK:0), - -1); + xferred); Warning("%s", trash); send_log(s->proxy, LOG_NOTICE, "%s", trash); @@ -535,7 +535,7 @@ static void set_server_enabled(struct server *s) { server_status_printf(&msg, s, (s->tracked?SSP_O_VIA:0) | SSP_O_STATUS | ((!s->tracked && !(s->proxy->options2 & PR_O2_LOGHCHKS))?SSP_O_HCHK:0), - -1); + xferred); Warning("%s", trash); send_log(s->proxy, LOG_NOTICE, "%s", trash);