mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

[BUG] health checks: fix requeued message

Browse Source 
Dummy copy&past is not a good idea. :( Also, we shoud
check "s->state & SRV_RUNNING" instead of xferred.
This commit is contained in:
Krzysztof Piotr Oledzki 2010-01-10 21:12:58 +01:00 committed by Willy Tarreau
parent 76bfc95aa5
commit b16a607997
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/checks.c
View File

@ -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);