BUG/MINOR: cli/mworker: can't start haproxy with 2 programs

When trying to start HAProxy with the master CLI and more than one
program in the configuration, it refuses to start with:

[ALERT] 013/132926 (1378) : parsing [cur--1:0] : proxy 'MASTER', another server named 'cur--1' was already defined at line 0, please use distinct names.
[ALERT] 013/132926 (1378) : Fatal errors found in configuration.

The problem is that haproxy tries to create a server for the MASTER
proxy but only the worker are supposed to be in the server list.

Fix issue #446.

Must be backported as far as 2.0.

diff --git a/src/cli.c b/src/cli.c
index ba48d147265f94aafdd0d52c2c26ff71c8f156d4..e1c8bdcbc12a4e148c51dfd9ef05262b9e6446cc 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -2453,6 +2453,10 @@ int mworker_cli_proxy_create()
                int port1, port2, port;
                struct protocol *proto;
 
+               /* only the workers support the master CLI */
+               if (!(child->options & PROC_O_TYPE_WORKER))
+                       continue;
+
                newsrv = new_server(mworker_proxy);
                if (!newsrv)
                        goto error;