diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-12-13 18:45:38 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-12-13 18:45:38 +0000 |
| commit | 01c75632144c5d054bbeb893ac4d0cda2d56b825 (patch) | |
| tree | 968aa3be51bc8925eb04aef369ce7ecfe46b4554 | |
| parent | ce1354c35384805bb03f07f0ac00ee717ef6d470 (diff) | |
| download | rabbitmq-server-01c75632144c5d054bbeb893ac4d0cda2d56b825.tar.gz | |
The arg to duplicate_node_check is always a string, and control:diags requires a real node
| -rw-r--r-- | src/rabbit_prelaunch.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl index fcc93e6f..8ae45abd 100644 --- a/src/rabbit_prelaunch.erl +++ b/src/rabbit_prelaunch.erl @@ -53,7 +53,7 @@ start() -> io:format("Activating RabbitMQ plugins ...~n"), %% Determine our various directories - [PluginDir, UnpackedPluginDir, Node] = init:get_plain_arguments(), + [PluginDir, UnpackedPluginDir, NodeStr] = init:get_plain_arguments(), RootName = UnpackedPluginDir ++ "/rabbit", %% Unpack any .ez plugins @@ -132,7 +132,7 @@ start() -> || App <- PluginApps], io:nl(), - ok = duplicate_node_check(Node), + ok = duplicate_node_check(NodeStr), terminate(0), ok. @@ -259,8 +259,9 @@ process_entry(Entry) -> duplicate_node_check([]) -> %% Ignore running node while installing windows service ok; -duplicate_node_check(Node) -> - {NodeName, NodeHost} = rabbit_misc:nodeparts(rabbit_misc:makenode(Node)), +duplicate_node_check(NodeStr) -> + Node = rabbit_misc:makenode(NodeStr), + {NodeName, NodeHost} = rabbit_misc:nodeparts(Node), case net_adm:names(NodeHost) of {ok, NamePorts} -> case proplists:is_defined(NodeName, NamePorts) of |