From: Tim Duesterhus <[email protected]>
Commit 4cfede87a313456fcbce7a185312460b4e1d05b7 removed
`exit-on-failure` in favor of `no-exit-on-failure`, but failed
to update references to the former in user facing messages.
This should be backported to haproxy 1.8.
---
src/cfgparse.c | 2 +-
src/haproxy.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 8486f0faa..baf9e60f7 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -742,7 +742,7 @@ int cfg_parse_global(const char *file, int linenum, char
**args, int kwm)
if (!strcmp(args[1], "no-exit-on-failure")) {
global.tune.options |= GTUNE_NOEXIT_ONFAILURE;
} else {
- ha_alert("parsing [%s:%d] : '%s' only supports
'exit-on-failure' option.\n", file, linenum, args[0]);
+ ha_alert("parsing [%s:%d] : '%s' only supports
'no-exit-on-failure' option.\n", file, linenum, args[0]);
err_code |= ERR_ALERT | ERR_FATAL;
goto out;
}
diff --git a/src/haproxy.c b/src/haproxy.c
index df8d34e74..5f3e3948d 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -761,7 +761,7 @@ restart_wait:
ha_alert("Current worker %d left with exit code
%d\n", exitpid, status);
if (status != 0 && status != 130 && status !=
143
&& !(global.tune.options &
GTUNE_NOEXIT_ONFAILURE)) {
- ha_alert("exit-on-failure: killing
every workers with SIGTERM\n");
+ ha_alert("Killing every worker with
SIGTERM\n");
mworker_kill(SIGTERM);
}
} else {
--
2.15.1
