MINOR: server: really increase the pool-purge-delay default to 5 seconds

Commit fb55365f9 ("MINOR: server: increase the default pool-purge-delay
to 5 seconds") did this but the setting placed in new_server() was
overwritten by srv_settings_cpy() from the default-server values preset
in init_default_instance(). Now let's put it at the right place.

diff --git a/src/cfgparse.c b/src/cfgparse.c
index ff20de137dd14be96acfa7ad8c833542b75d5f5f..98adadffa4f05541110f2c3478000414b715a759 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -478,7 +478,7 @@ void init_default_instance()
        defproxy.defsrv.maxconn = 0;
        defproxy.defsrv.max_reuse = -1;
        defproxy.defsrv.max_idle_conns = -1;
-       defproxy.defsrv.pool_purge_delay = 1000;
+       defproxy.defsrv.pool_purge_delay = 5000;
        defproxy.defsrv.slowstart = 0;
        defproxy.defsrv.onerror = DEF_HANA_ONERR;
        defproxy.defsrv.consecutive_errors_limit = DEF_HANA_ERRLIMIT;

diff --git a/src/server.c b/src/server.c
index bec498c2a44e5a3468efe2c8783376c4a2e6ba92..14e1a938c3c71fe66a02a093cbf6d3878e5958b0 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -1818,10 +1818,9 @@ struct server *new_server(struct proxy *proxy)
        srv->agent.proxy = proxy;
        srv->xprt  = srv->check.xprt = srv->agent.xprt = xprt_get(XPRT_RAW);
 
-       srv->pool_purge_delay = 5000;
-       srv->max_idle_conns = -1;
-       srv->max_reuse = -1;
-
+       /* please don't put default server settings here, they are set in
+        * init_default_instance().
+        */
        return srv;
 }