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 ff20de1..98adadf 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -478,7 +478,7 @@
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 bec498c..14e1a93 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1818,10 +1818,9 @@
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;
}