kozorizki/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG/MINOR: mworker: don't exit with an ambiguous value

Browse Source 
When the sigchld handler is called and waitpid() returns -1,
the behavior of waitpid() with the status variable is undefined.
It is not a good idea to exit with the value contained in it.

Since this exit path does not use the exitcode variable, it means that
this is an expected and successful exit.

This should be backported in 1.9, code has moved,
mworker_catch_sigchld() is in haproxy.c.
This commit is contained in:
William Lallemand 2019-04-16 17:42:43 +02:00 committed by Willy Tarreau
parent 32b6901550
commit 4cf4b33744
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mworker.c
View File

@ -295,11 +295,11 @@ restart_wait:
}
/* Better rely on the system than on a list of process to check if it was the last one */
else if (exitpid == -1 && errno == ECHILD) {
ha_warning("All workers exited. Exiting... (%d)\n", (exitcode > 0) ? exitcode : status);
ha_warning("All workers exited. Exiting... (%d)\n", (exitcode > 0) ? exitcode : EXIT_SUCCESS);
atexit_flag = 0;
if (exitcode > 0)
exit(exitcode);
exit(status); /* parent must leave using the latest status code known */
exit(exitcode); /* parent must leave using the status code that provoked the exit */
exit(EXIT_SUCCESS);
}
}