From: William Lallemand <wlallemand@haproxy.com>
Date: Mon, 6 Nov 2017 10:00:02 +0000 (+0100)
Subject: MINOR: add master-worker in the warning about nbproc
X-Git-Tag: v1.8-rc3~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc113822a74ff0474d123b129dc2041d4f386060;p=thirdparty%2Fhaproxy.git

MINOR: add master-worker in the warning about nbproc
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 68b5e427b0..bbd26b82de 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1749,7 +1749,7 @@ static void init(int argc, char **argv)
 
 	if ((global.nbproc > 1) && !(global.mode & (MODE_DAEMON | MODE_MWORKER))) {
 		if (!(global.mode & (MODE_FOREGROUND | MODE_DEBUG)))
-			Warning("<nbproc> is only meaningful in daemon mode. Setting limit to 1 process.\n");
+			Warning("<nbproc> is only meaningful in daemon mode or master-worker mode. Setting limit to 1 process.\n");
 		global.nbproc = 1;
 	}