Merged bug23591 into default

3 files changed, 3 insertions, 2 deletions

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 5b29129073..4155b31d99 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -90,6 +90,7 @@ if [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then
 	-noinput \
 	-hidden \
 	-s rabbit_prelaunch \
+	-sname rabbitmqprelaunch$$ \
 	-extra "$RABBITMQ_PLUGINS_DIR" "${RABBITMQ_PLUGINS_EXPAND_DIR}" "${RABBITMQ_NODENAME}"
     then
 	RABBITMQ_BOOT_FILE="${RABBITMQ_PLUGINS_EXPAND_DIR}/rabbit"
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 872c87e3ab..52a250c6af 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -118,6 +118,7 @@ set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin
 -pa "!RABBITMQ_EBIN_ROOT!" ^

 -noinput -hidden ^

 -s rabbit_prelaunch ^

+-sname rabbitmqprelaunch%RANDOM% ^

 -extra "!RABBITMQ_PLUGINS_DIR:\=/!" ^

        "!RABBITMQ_PLUGINS_EXPAND_DIR:\=/!" ^

        "!RABBITMQ_NODENAME!"

diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl
index 35d0876ca5..fcc93e6fdd 100644
--- a/src/rabbit_prelaunch.erl
+++ b/src/rabbit_prelaunch.erl
@@ -260,7 +260,7 @@ duplicate_node_check([]) ->
     %% Ignore running node while installing windows service
     ok;
 duplicate_node_check(Node) ->
-    {NodeName, NodeHost} = rabbit_misc:nodeparts(Node),
+    {NodeName, NodeHost} = rabbit_misc:nodeparts(rabbit_misc:makenode(Node)),
     case net_adm:names(NodeHost) of
         {ok, NamePorts}  ->
             case proplists:is_defined(NodeName, NamePorts) of
@@ -272,7 +272,6 @@ duplicate_node_check(Node) ->
                              terminate(?ERROR_CODE);
                      false -> ok
             end;
-        {error, address}    -> ok;
         {error, EpmdReason} -> terminate("unexpected epmd error: ~p~n",
                                          [EpmdReason])
     end.