mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2025-11-10 13:31:30 +01:00
MEDIUM: cfgparse: deprecate 'master-worker' keyword alone
Warn when the 'master-worker' keyword is used without 'no-exit-on-failure'. Warn when the 'master-worker' keyword is used and -W and -Ws already set the mode.
This commit is contained in:
parent
096999ee20
commit
631233e9ec
@ -962,6 +962,13 @@ static int cfg_parse_global_master_worker(char **args, int section_type,
|
|||||||
if (too_many_args(1, args, err, NULL))
|
if (too_many_args(1, args, err, NULL))
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
if (!*args[1]) {
|
||||||
|
if (global.mode & MODE_MWORKER) {
|
||||||
|
ha_warning("master-worker mode is already configured.\n");
|
||||||
|
}
|
||||||
|
ha_warning("The '%s' keyword is deprecated in 3.3 and will be removed in 3.5. Use -W or -Ws in the startup script instead.\n", args[0]);
|
||||||
|
}
|
||||||
|
|
||||||
if (*args[1]) {
|
if (*args[1]) {
|
||||||
if (strcmp(args[1], "no-exit-on-failure") == 0)
|
if (strcmp(args[1], "no-exit-on-failure") == 0)
|
||||||
global.tune.options |= GTUNE_NOEXIT_ONFAILURE;
|
global.tune.options |= GTUNE_NOEXIT_ONFAILURE;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user