From: Willy Tarreau <w@1wt.eu>
Date: Wed, 11 Dec 2013 20:26:24 +0000 (+0100)
Subject: MEDIUM: checks: enable agent checks even if health checks are disabled
X-Git-Tag: v1.5-dev20~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d924cc74caf41ca458abfaf66dac7bd1de1e97f;p=thirdparty%2Fhaproxy.git

MEDIUM: checks: enable agent checks even if health checks are disabled

The agent is able to retrieve some weight information from the server
and will eventually be able to force the server into maintenance mode.
It doesn't seem logical to have it depend on the health check being
configured, as for some servers it might very well make sense to only
fetch the weight from the server's load regardless of the health.

So let's stop disabling the agent checks when health checks are disabled.
---

diff --git a/src/checks.c b/src/checks.c
index 9b00062eaa..9fdf0603f7 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -1507,9 +1507,7 @@ static struct task *process_chk(struct task *t)
 		 * stopped, the server should not be checked or the check
 		 * is disabled.
 		 */
-		if (!(check->state & CHK_ST_ENABLED) ||
-		    !(s->check.state & CHK_ST_ENABLED) ||
-		    (s->check.state & CHK_ST_PAUSED) ||
+		if (((check->state & (CHK_ST_ENABLED | CHK_ST_PAUSED)) != CHK_ST_ENABLED) ||
 		    s->proxy->state == PR_STSTOPPED)
 			goto reschedule;