mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 13:51:26 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Willy Tarreau 2019-06-06 16:25:55 +02:00
parent 56aec0ddc6
commit 975b155ebb
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cfgparse.c
View File

@ -478,7 +478,7 @@ void init_default_instance()
defproxy.defsrv.maxconn = 0; defproxy.defsrv.maxconn = 0;
defproxy.defsrv.max_reuse = -1; defproxy.defsrv.max_reuse = -1;
defproxy.defsrv.max_idle_conns = -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.slowstart = 0;
defproxy.defsrv.onerror = DEF_HANA_ONERR; defproxy.defsrv.onerror = DEF_HANA_ONERR;
defproxy.defsrv.consecutive_errors_limit = DEF_HANA_ERRLIMIT; defproxy.defsrv.consecutive_errors_limit = DEF_HANA_ERRLIMIT;

7
src/server.c
View File

@ -1818,10 +1818,9 @@ struct server *new_server(struct proxy *proxy)
srv->agent.proxy = proxy; srv->agent.proxy = proxy;
srv->xprt = srv->check.xprt = srv->agent.xprt = xprt_get(XPRT_RAW); srv->xprt = srv->check.xprt = srv->agent.xprt = xprt_get(XPRT_RAW);
srv->pool_purge_delay = 5000; /* please don't put default server settings here, they are set in
srv->max_idle_conns = -1; * init_default_instance().
srv->max_reuse = -1; */
return srv; return srv;
} }