diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-03-20 12:48:37 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-03-20 12:48:37 +0000 |
| commit | 2103ece8fdaaa7aead5252d4f96c3fbe0c4cab75 (patch) | |
| tree | c8acaceafe762f96218dcf93a0c170cdab2c0fcb /src | |
| parent | 073db28b0718b66850b0d1e823b997329f46a16b (diff) | |
| download | rabbitmq-server-git-2103ece8fdaaa7aead5252d4f96c3fbe0c4cab75.tar.gz | |
Don't show diagnostics after "node already running" since diagnostics are meant to be about *not* being able to connect to a node.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_prelaunch.erl | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl index 4037ed4410..5e2ef1e883 100644 --- a/src/rabbit_prelaunch.erl +++ b/src/rabbit_prelaunch.erl @@ -44,7 +44,7 @@ start() -> [NodeStr] -> Node = rabbit_nodes:make(NodeStr), {NodeName, NodeHost} = rabbit_nodes:parts(Node), - ok = duplicate_node_check(Node, NodeName, NodeHost), + ok = duplicate_node_check(NodeName, NodeHost), ok = dist_port_set_check(), ok = dist_port_use_check(NodeHost); [] -> @@ -61,14 +61,13 @@ stop() -> %%---------------------------------------------------------------------------- %% Check whether a node with the same name is already running -duplicate_node_check(Node, NodeName, NodeHost) -> +duplicate_node_check(NodeName, NodeHost) -> case rabbit_nodes:names(NodeHost) of {ok, NamePorts} -> case proplists:is_defined(NodeName, NamePorts) of - true -> io:format("ERROR: node with name ~p " - "already running on ~p~n", - [NodeName, NodeHost]), - io:format(rabbit_nodes:diagnostics([Node]) ++ "~n"), + true -> io:format( + "ERROR: node with name ~p already running on ~p~n", + [NodeName, NodeHost]), rabbit_misc:quit(?ERROR_CODE); false -> ok end; |
