]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: server: initialize fields for dynamic server check
authorAmaury Denoyelle <adenoyelle@haproxy.com>
Thu, 22 Jul 2021 14:03:36 +0000 (16:03 +0200)
committerAmaury Denoyelle <adenoyelle@haproxy.com>
Fri, 6 Aug 2021 09:08:04 +0000 (11:08 +0200)
Set default inter/rise/fall values for dynamic servers check/agent. This
is required because dynamic servers do not inherit from a
default-server.

src/server.c

index 54f34d0aced6c7da6ca33ddaea76875f77f851e0..9895257616be4408c2ff264b182d2d78da5b99f9 100644 (file)
@@ -2538,6 +2538,15 @@ static int _srv_parse_init(struct server **srv, char **args, int *cur_arg,
                        newsrv->next_admin = SRV_ADMF_FMAINT;
                        newsrv->next_state = SRV_ST_STOPPED;
                        server_recalc_eweight(newsrv, 0);
+
+                       /* Set default values for checks */
+                       newsrv->check.inter = DEF_CHKINTR;
+                       newsrv->check.rise = DEF_RISETIME;
+                       newsrv->check.fall = DEF_FALLTIME;
+
+                       newsrv->agent.inter = DEF_CHKINTR;
+                       newsrv->agent.rise = DEF_AGENT_RISETIME;
+                       newsrv->agent.fall = DEF_AGENT_FALLTIME;
                }
                HA_SPIN_INIT(&newsrv->lock);
        }