mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-23 20:01:23 +01:00
Code Issues Projects Releases Wiki Activity

MEDIUM: init: don't stop proxies in parent process when exiting

Browse Source 
That's pointless, and that's confusing when debugging.
This commit is contained in:
Willy Tarreau 2015-05-01 17:01:08 +02:00
parent 02df7740fb
commit edaff0a8f5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/haproxy.c
View File

@ -1780,6 +1780,15 @@ int main(int argc, char **argv)
free(global.chroot); global.chroot = NULL; free(global.chroot); global.chroot = NULL;
free(global.pidfile); global.pidfile = NULL; free(global.pidfile); global.pidfile = NULL;
if (proc == global.nbproc) {
if (global.mode & MODE_SYSTEMD) {
protocol_unbind_all();
for (proc = 0; proc < global.nbproc; proc++)
while (waitpid(children[proc], NULL, 0) == -1 && errno == EINTR);
}
exit(0); /* parent must leave */
}
/* we might have to unbind some proxies from some processes */ /* we might have to unbind some proxies from some processes */
px = proxy; px = proxy;
while (px != NULL) { while (px != NULL) {
@ -1790,15 +1799,6 @@ int main(int argc, char **argv)
px = px->next; px = px->next;
} }
if (proc == global.nbproc) {
if (global.mode & MODE_SYSTEMD) {
protocol_unbind_all();
for (proc = 0; proc < global.nbproc; proc++)
while (waitpid(children[proc], NULL, 0) == -1 && errno == EINTR);
}
exit(0); /* parent must leave */
}
free(children); free(children);
children = NULL; children = NULL;
/* if we're NOT in QUIET mode, we should now close the 3 first FDs to ensure /* if we're NOT in QUIET mode, we should now close the 3 first FDs to ensure