diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2010-12-13 10:51:28 +0000 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2010-12-13 10:51:28 +0000 |
| commit | 368bfaf8a74305a33ec03b3367d8c6c3fd14cb66 (patch) | |
| tree | f1299e1ee026ecd553fcb1e379d6dafcf3603196 /src | |
| parent | 12f170a59ab4ed7dcc9ccd976d7ab027c1ec515b (diff) | |
| parent | a89cc42d89869a79a95643b83f04cb0cf129e610 (diff) | |
| download | rabbitmq-server-git-368bfaf8a74305a33ec03b3367d8c6c3fd14cb66.tar.gz | |
Merged bug23591 into default
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_prelaunch.erl | 3 |
1 files changed, 1 insertions, 2 deletions
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. |