RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-20 18:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: init: move some maxsock updates earlier

Browse Source 
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.
This commit is contained in:
Willy Tarreau 2019-03-01 09:39:42 +01:00
parent 5a023f0d7a
commit 8d687d8464
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/haproxy.c
View File

@ -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)