RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-06 01:37:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: mworker: Improve wording in void mworker_wait()

Browse Source 
Replace "left" / "leaving" with "exit" / "exiting".

This should be backported to haproxy 1.8.
This commit is contained in:
Tim Duesterhus 2017-12-05 18:14:13 +01:00 committed by Willy Tarreau
parent c578d9acfa
commit d16f450c98
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/haproxy.c
View File

@ -755,7 +755,7 @@ restart_wait:
} }
if (exitpid == -1 && errno == ECHILD) { if (exitpid == -1 && errno == ECHILD) {
ha_warning("All workers are left. Leaving... (%d)\n", status); ha_warning("All workers exited. Exiting... (%d)\n", status);
atexit_flag = 0; atexit_flag = 0;
exit(status); /* parent must leave using the latest status code known */ exit(status); /* parent must leave using the latest status code known */
} }
@ -770,18 +770,18 @@ restart_wait:
status = 255; status = 255;
if (!children) { if (!children) {
ha_warning("Worker %d left with exit code %d\n", exitpid, status); ha_warning("Worker %d exited with code %d\n", exitpid, status);
} else { } else {
/* check if exited child was in the current children list */ /* check if exited child was in the current children list */
if (current_child(exitpid)) { if (current_child(exitpid)) {
ha_alert("Current worker %d left with exit code %d\n", exitpid, status); ha_alert("Current worker %d exited with code %d\n", exitpid, status);
if (status != 0 && status != 130 && status != 143 if (status != 0 && status != 130 && status != 143
&& !(global.tune.options & GTUNE_NOEXIT_ONFAILURE)) { && !(global.tune.options & GTUNE_NOEXIT_ONFAILURE)) {
ha_alert("exit-on-failure: killing every workers with SIGTERM\n"); ha_alert("exit-on-failure: killing every workers with SIGTERM\n");
mworker_kill(SIGTERM); mworker_kill(SIGTERM);
} }
} else { } else {
ha_warning("Former worker %d left with exit code %d\n", exitpid, status); ha_warning("Former worker %d exited with code %d\n", exitpid, status);
delete_oldpid(exitpid); delete_oldpid(exitpid);
} }
} }