RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-16 22:58:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: mworker: exit with the incriminated exit code

Browse Source 
The former behavior was to exit() the master process with the latest
status code known, which was the one of the last process to exit.

The problem is that the master process was not exiting with the status
code which provoked the exit-on-failure.
This commit is contained in:
William Lallemand 2018-11-06 17:37:14 +01:00 committed by Willy Tarreau
parent 18e52a8834
commit 91723745c6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/haproxy.c
View File

@ -193,6 +193,8 @@ static char *cur_unixsocket = NULL;
int atexit_flag = 0;
static int exitcode = -1;
int nb_oldpids = 0;
const int zero = 0;
const int one = 1;
@ -827,6 +829,8 @@ restart_wait:
if (status != 0 && status != 130 && status != 143
&& !(global.tune.options & GTUNE_NOEXIT_ONFAILURE)) {
ha_alert("exit-on-failure: killing every workers with SIGTERM\n");
if (exitcode < 0)
exitcode = status;
mworker_kill(SIGTERM);
}
} else {
@ -843,6 +847,8 @@ restart_wait:
else if (exitpid == -1 && errno == ECHILD) {
ha_warning("All workers exited. Exiting... (%d)\n", (exitcode > 0) ? exitcode : status);
atexit_flag = 0;
if (exitcode > 0)
exit(exitcode);
exit(status); /* parent must leave using the latest status code known */
}