From a655ba4a9498b91fb36de0374eb8a8f636bef46b Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Wed, 6 May 2020 17:27:03 +0200 Subject: [PATCH] MINOR: mworker: replace ha_alert by ha_warning when exiting successfuly Since commit bb86986 ("MINOR: init: report the haproxy version and executable path once on errors") the master-worker displays its version and path upon a successful exits of a current worker. Which is kind of confusing upon a clean exits. This is due to the fact that that commit displays this upon a ha_alert() which was used during the exit of the process. Replace the ha_alert() by an ha_warning() if the process exit correctly and was supposed to. It still displays the message upon a SIGINT since the workers are catching the signal. --- src/mworker.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mworker.c b/src/mworker.c index ff3e16b8f..9c46fffe5 100644 --- a/src/mworker.c +++ b/src/mworker.c @@ -290,8 +290,12 @@ void mworker_catch_sigchld(struct sig_handler *sh) } else { /* check if exited child is a current child */ if (!(child->options & PROC_O_LEAVING)) { - if (child->options & PROC_O_TYPE_WORKER) - ha_alert("Current worker #%d (%d) exited with code %d (%s)\n", child->relative_pid, exitpid, status, (status >= 128) ? strsignal(status - 128) : "Exit"); + if (child->options & PROC_O_TYPE_WORKER) { + if (status < 128) + ha_warning("Current worker #%d (%d) exited with code %d (%s)\n", child->relative_pid, exitpid, status, "Exit"); + else + ha_alert("Current worker #%d (%d) exited with code %d (%s)\n", child->relative_pid, exitpid, status, strsignal(status - 128)); + } else if (child->options & PROC_O_TYPE_PROG) ha_alert("Current program '%s' (%d) exited with code %d (%s)\n", child->id, exitpid, status, (status >= 128) ? strsignal(status - 128) : "Exit");