From 8d687d846485e41afc359f0006d08dd559adddda Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 1 Mar 2019 09:39:42 +0100 Subject: [PATCH] MINOR: init: move some maxsock updates earlier We'll need to know the global maxsock before the maxconn calculation. Actually only two components were calculated too late, the peers FD and the stats FD. Let's move them a few lines upward. --- src/haproxy.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/haproxy.c b/src/haproxy.c index 21bfcbd97..22cd51e8b 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -1940,6 +1940,18 @@ static void init(int argc, char **argv) if (cfg_maxconn > 0) global.maxconn = cfg_maxconn; + if (global.stats_fe) + global.maxsock += global.stats_fe->maxconn; + + if (cfg_peers) { + /* peers also need to bypass global maxconn */ + struct peers *p = cfg_peers; + + for (p = cfg_peers; p; p = p->next) + if (p->peers_fe) + global.maxsock += p->peers_fe->maxconn; + } + if (cfg_pidfile) { free(global.pidfile); global.pidfile = strdup(cfg_pidfile); @@ -2098,18 +2110,6 @@ static void init(int argc, char **argv) global.maxsock += global.maxconn * sides * global.ssl_used_async_engines; } - if (global.stats_fe) - global.maxsock += global.stats_fe->maxconn; - - if (cfg_peers) { - /* peers also need to bypass global maxconn */ - struct peers *p = cfg_peers; - - for (p = cfg_peers; p; p = p->next) - if (p->peers_fe) - global.maxsock += p->peers_fe->maxconn; - } - proxy_adjust_all_maxconn(); if (global.tune.maxpollevents <= 0)