]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: checks: fix agent check interval computation
authorWilly Tarreau <w@1wt.eu>
Wed, 11 Dec 2013 19:41:18 +0000 (20:41 +0100)
committerWilly Tarreau <w@1wt.eu>
Sat, 14 Dec 2013 15:02:19 +0000 (16:02 +0100)
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.

src/checks.c

index ec057812f4910c6e5fd449921c72b7fa09f09dc9..9d906bdfb3b6663ce8679f64eef35486104df5dc 100644 (file)
@@ -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++;
                }
        }