From: Willy Tarreau <w@1wt.eu>
Date: Wed, 11 Dec 2013 19:41:18 +0000 (+0100)
Subject: MINOR: checks: fix agent check interval computation
X-Git-Tag: v1.5-dev20~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15f39102145af20800d906843e4dd7f8f7340245;p=thirdparty%2Fhaproxy.git

MINOR: checks: fix agent check interval computation

start_checks() only used to consider the health checks intervals to
compute the start interval, so if an agent had a faster check than
all health checks, it would be significantly delayed.
---

diff --git a/src/checks.c b/src/checks.c
index ec057812f4..9d906bdfb3 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -1771,6 +1771,11 @@ int start_checks() {
 			    (!mininter || mininter > srv_getinter(&s->check)))
 				mininter = srv_getinter(&s->check);
 
+			if ((s->agent.state & CHK_ST_CONFIGURED) &&
+			    (srv_getinter(&s->agent) >= SRV_CHK_INTER_THRES) &&
+			    (!mininter || mininter > srv_getinter(&s->agent)))
+				mininter = srv_getinter(&s->agent);
+
 			nbcheck++;
 		}
 	}