RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-06 03:18:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: mworker: don't deinit the poller fd when in wait mode

Browse Source 
If haproxy failed to load its configuration, the process is reexecuted
and it did not init the poller. So we must not try to deinit the poller
before the exec().
This commit is contained in:
William Lallemand 2018-09-11 10:06:24 +02:00 committed by Willy Tarreau
parent d3801c1c21
commit de0ff5ab20
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/haproxy.c
View File

@ -666,7 +666,8 @@ static void mworker_reload()
next_argv[next_argc++] = NULL;
}
deinit_pollers(); /* we don't want to leak the poller fd */
if (getenv("HAPROXY_MWORKER_WAIT_ONLY") == NULL)
deinit_pollers(); /* we don't want to leak the poller fd */
ha_warning("Reexecuting Master process\n");
execvp(next_argv[0], next_argv);