Welcome! Log In Create A New Profile

Advanced

[PATCH 2/2] DOC: mworker: Improve wording in `void mworker_wait()`

Posted by Tim Düsterhus 
From: Tim Duesterhus <[email protected]>

Replace "left" / "leaving" with "exit" / "exiting".
---
src/haproxy.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/haproxy.c b/src/haproxy.c
index 5f3e3948d..528531f79 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -739,7 +739,7 @@ restart_wait:
}

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;
exit(status); /* parent must leave using the latest status code known */
}
@@ -754,18 +754,18 @@ restart_wait:
status = 255;

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 {
/* check if exited child was in the current children list */
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
&& !(global.tune.options & GTUNE_NOEXIT_ONFAILURE)) {
ha_alert("Killing every worker with SIGTERM\n");
mworker_kill(SIGTERM);
}
} 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);
}
}
--
2.15.1
Sorry, only registered users may post in this forum.

Click here to login