From: William Lallemand <wlallemand@haproxy.com>
Date: Wed, 5 Nov 2025 10:34:06 +0000 (+0100)
Subject: MEDIUM: cfgparse: deprecate 'master-worker' keyword alone
X-Git-Tag: v3.3-dev12~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=631233e9eccd72bc47d05076d1102e48d78b1004;p=thirdparty%2Fhaproxy.git

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.
---

diff --git a/src/cfgparse-global.c b/src/cfgparse-global.c
index 6ad44e6a8..bbd45a2df 100644
--- a/src/cfgparse-global.c
+++ b/src/cfgparse-global.c
@@ -962,6 +962,13 @@ static int cfg_parse_global_master_worker(char **args, int section_type,
 	if (too_many_args(1, args, err, NULL))
 		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 (strcmp(args[1], "no-exit-on-failure") == 0)
 			global.tune.options |= GTUNE_NOEXIT_ONFAILURE;