multi is a convenience. It should blow up when starting > 1 nodes when we have multiple tcp listeners. When starting > 1 nodes, make sure we export the discovered node ip address and port. When starting just 1 node, don't export anything - either rabbit-server will rediscover it in the env, or it's all configured in the config file.

5 files changed, 59 insertions, 19 deletions

diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi
index d8b0f074..1a7eb97e 100755
--- a/scripts/rabbitmq-multi
+++ b/scripts/rabbitmq-multi
@@ -36,6 +36,7 @@ SCRIPT_HOME=$(dirname $0)
 PIDS_FILE=/var/lib/rabbitmq/pids
 MULTI_ERL_ARGS=
 MULTI_START_ARGS=
+CONFIG_FILE=/etc/rabbitmq/rabbitmq
 
 . `dirname $0`/rabbitmq-env
 
@@ -54,13 +55,18 @@ fi
 [ "x" = "x$RABBITMQ_PIDS_FILE" ] && RABBITMQ_PIDS_FILE=${PIDS_FILE}
 [ "x" = "x$RABBITMQ_MULTI_ERL_ARGS" ] && RABBITMQ_MULTI_ERL_ARGS=${MULTI_ERL_ARGS}
 [ "x" = "x$RABBITMQ_MULTI_START_ARGS" ] && RABBITMQ_MULTI_START_ARGS=${MULTI_START_ARGS}
+[ "x" = "x$RABBITMQ_CONFIG_FILE" ] && RABBITMQ_CONFIG_FILE=${CONFIG_FILE}
 
 export \
     RABBITMQ_NODENAME \
     RABBITMQ_NODE_IP_ADDRESS \
     RABBITMQ_NODE_PORT \
     RABBITMQ_SCRIPT_HOME \
-    RABBITMQ_PIDS_FILE
+    RABBITMQ_PIDS_FILE \
+    RABBITMQ_CONFIG_FILE
+
+RABBITMQ_CONFIG_ARG=
+[ -f "${RABBITMQ_CONFIG_FILE}.config" ] && RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE}"
 
 # we need to turn off path expansion because some of the vars, notably
 # RABBITMQ_MULTI_ERL_ARGS, may contain terms that look like globs and
@@ -73,6 +79,7 @@ exec erl \
     -hidden \
     ${RABBITMQ_MULTI_ERL_ARGS} \
     -sname rabbitmq_multi$$ \
+    ${RABBITMQ_CONFIG_ARG} \
     -s rabbit_multi \
     ${RABBITMQ_MULTI_START_ARGS} \
     -extra "$@"
diff --git a/scripts/rabbitmq-multi.bat b/scripts/rabbitmq-multi.bat
index 9f134f17..6dda13af 100755
--- a/scripts/rabbitmq-multi.bat
+++ b/scripts/rabbitmq-multi.bat
@@ -53,10 +53,20 @@ if "%RABBITMQ_NODE_IP_ADDRESS%"=="" (
 set RABBITMQ_PIDS_FILE=%RABBITMQ_BASE%\rabbitmq.pids

 set RABBITMQ_SCRIPT_HOME=%~sdp0%

 

+if "%RABBITMQ_CONFIG_FILE%"=="" (

+    set RABBITMQ_CONFIG_FILE=%RABBITMQ_BASE%\rabbitmq

+)

+

+if exist "%RABBITMQ_CONFIG_FILE%.config" (

+    set RABBITMQ_CONFIG_ARG=-config "%RABBITMQ_CONFIG_FILE%"

+) else (

+    set RABBITMQ_CONFIG_ARG=

+)

+

 if not exist "%ERLANG_HOME%\bin\erl.exe" (

     echo.

     echo ******************************

-    echo ERLANG_HOME not set correctly. 

+    echo ERLANG_HOME not set correctly.

     echo ******************************

     echo.

     echo Please either set ERLANG_HOME to point to your Erlang installation or place the

@@ -70,6 +80,7 @@ if not exist "%ERLANG_HOME%\bin\erl.exe" (
 -noinput -hidden ^

 %RABBITMQ_MULTI_ERL_ARGS% ^

 -sname rabbitmq_multi ^

+%RABBITMQ_CONFIG_ARG% ^

 -s rabbit_multi ^

 %RABBITMQ_MULTI_START_ARGS% ^

 -extra %*

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 8ba7d6b8..7f08cd9d 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -44,7 +44,6 @@ SERVER_START_ARGS=
 
 . `dirname $0`/rabbitmq-env
 
-
 if [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ]
 then
     if [ "x" != "x$RABBITMQ_NODE_PORT" ]
@@ -99,7 +98,7 @@ RABBITMQ_CONFIG_ARG=
 [ -f "${RABBITMQ_CONFIG_FILE}.config" ] && RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE}"
 
 RABBITMQ_LISTEN_ARG=
-[ "x" != "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_LISTEN_ARG="-rabbit tcp_listeners '[{"'${RABBITMQ_NODE_IP_ADDRESS}'", '${RABBITMQ_NODE_PORT}'}]'"
+[ "x" != "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_LISTEN_ARG="-rabbit tcp_listeners [{\""${RABBITMQ_NODE_IP_ADDRESS}"\","${RABBITMQ_NODE_PORT}"}]"
 
 # we need to turn off path expansion because some of the vars, notably
 # RABBITMQ_SERVER_ERL_ARGS, contain terms that look like globs and
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 42ed185f..51102851 100755
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -53,7 +53,7 @@ if "%RABBITMQ_NODE_IP_ADDRESS%"=="" (
 if not exist "%ERLANG_HOME%\bin\erl.exe" (

     echo.

     echo ******************************

-    echo ERLANG_HOME not set correctly. 

+    echo ERLANG_HOME not set correctly.

     echo ******************************

     echo.

     echo Please either set ERLANG_HOME to point to your Erlang installation or place the

@@ -116,7 +116,7 @@ if exist "%RABBITMQ_EBIN_ROOT%\rabbit.boot" (
 if "%RABBITMQ_CONFIG_FILE%"=="" (

     set RABBITMQ_CONFIG_FILE=%RABBITMQ_BASE%\rabbitmq

 )

-   

+

 if exist "%RABBITMQ_CONFIG_FILE%.config" (

     set RABBITMQ_CONFIG_ARG=-config "%RABBITMQ_CONFIG_FILE%"

 ) else (

@@ -126,7 +126,7 @@ if exist "%RABBITMQ_CONFIG_FILE%.config" (
 set RABBITMQ_LISTEN_ARG=

 if not "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

    if not "%RABBITMQ_NODE_PORT%"=="" (

-      set RABBITMQ_LISTEN_ARG=-rabbit tcp_listeners "[{\"%RABBITMQ_NODE_IP_ADDRESS%\", %RABBITMQ_NODE_PORT%}]"

+      set RABBITMQ_LISTEN_ARG=-rabbit tcp_listeners [{\""%RABBITMQ_NODE_IP_ADDRESS%"\","%RABBITMQ_NODE_PORT%"}]

    )

 )

 

diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl
index f364872e..7f53e2df 100644
--- a/src/rabbit_multi.erl
+++ b/src/rabbit_multi.erl
@@ -99,12 +99,13 @@ Available commands:
 
 action(start_all, [NodeCount], RpcTimeout) ->
     io:format("Starting all nodes...~n", []),
+    application:load(rabbit),
     N = list_to_integer(NodeCount),
     {NodePids, Running} =
         start_nodes(N, N, [], true,
                     rabbit_misc:nodeparts(
                       getenv("RABBITMQ_NODENAME")),
-                    list_to_integer(getenv("RABBITMQ_NODE_PORT")),
+                    get_node_tcp_listener(1 == N),
                     RpcTimeout),
     write_pids_file(NodePids),
     case Running of
@@ -158,26 +159,30 @@ action(rotate_logs, [Suffix], RpcTimeout) ->
 %% Running is a boolean exhibiting success at some moment
 start_nodes(0, _, PNodePid, Running, _, _, _) -> {PNodePid, Running};
 
+start_nodes(1, 1, [], true, NodeName, NodeListen, RpcTimeout) ->
+    {NodePid, Started} = start_single_node(rabbit_misc:makenode(NodeName),
+                                           RpcTimeout),
+    start_nodes(0, 1, [NodePid], Started, NodeName, NodeListen, RpcTimeout);
+
 start_nodes(N, Total, PNodePid, Running,
-            NodeNameBase, NodePortBase, RpcTimeout) ->
+            NodeNameBase, {NodeIpAddress, NodePortBase}, RpcTimeout) ->
     {NodePre, NodeSuff} = NodeNameBase,
     NodeNumber = Total - N,
-    NodePre1 = if NodeNumber == 0 ->
-                       %% For compatibility with running a single node
-                       NodePre;
-                  true ->           
-                       NodePre ++ "_" ++ integer_to_list(NodeNumber)
-               end,
+    NodePre1 = NodePre ++ "_" ++ integer_to_list(NodeNumber),
     {NodePid, Started} = start_node(rabbit_misc:makenode({NodePre1, NodeSuff}),
-                                    NodePortBase + NodeNumber,
+                                    {NodeIpAddress, NodePortBase + NodeNumber},
                                     RpcTimeout),
     start_nodes(N - 1, Total, [NodePid | PNodePid],
-                Started and Running,
-                NodeNameBase, NodePortBase, RpcTimeout).
+                Started and Running, NodeNameBase,
+                {NodeIpAddress, NodePortBase}, RpcTimeout).
 
-start_node(Node, NodePort, RpcTimeout) ->
+start_node(Node, {NodeIpAddress, NodePort}, RpcTimeout) ->
     os:putenv("RABBITMQ_NODENAME", atom_to_list(Node)),
     os:putenv("RABBITMQ_NODE_PORT", integer_to_list(NodePort)),
+    os:putenv("RABBITMQ_NODE_IP_ADDRESS", atom_to_list(NodeIpAddress)),
+    start_single_node(Node, RpcTimeout).
+
+start_single_node(Node, RpcTimeout) ->
     io:format("Starting node ~s...~n", [Node]),
     case rpc:call(Node, os, getpid, []) of
         {badrpc, _} ->
@@ -321,3 +326,21 @@ getenv(Var) ->
         false -> throw({missing_env_var, Var});
         Value -> Value
     end.
+
+get_node_tcp_listener(OneNode) ->
+    try
+        {list_to_atom(getenv("RABBITMQ_NODE_IP_ADDRESS")),
+         list_to_integer(getenv("RABBITMQ_NODE_PORT"))}
+    catch _ ->
+            case application:get_env(rabbit, tcp_listeners) of
+                {ok, [{_IpAddy, _Port} = Listener]} ->
+                    Listener;
+                {ok, _Other} when OneNode ->
+                    it_matters_not;
+                {ok, Other} ->
+                    throw({cannot_start_multiple_nodes, multiple_tcp_listeners,
+                           Other});
+                undefined ->
+                    throw({missing_configuration, tcp_listeners})
+            end
+    end.