summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-08-08 15:17:07 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2012-08-08 15:17:07 +0100
commitd555baf8b1ac897d41714f2777b43bc4880a1963 (patch)
treeec3f81791a3565959f153dac694bbb320caeb87e /src
parent21bcf2bbd44573a0326b7b0141aa6cdd5e2eae89 (diff)
downloadrabbitmq-server-git-d555baf8b1ac897d41714f2777b43bc4880a1963.tar.gz
the second half of removing rabbit_misc:quit/2
oops
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_prelaunch.erl7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl
index b045443533..404afe3c3b 100644
--- a/src/rabbit_prelaunch.erl
+++ b/src/rabbit_prelaunch.erl
@@ -57,7 +57,7 @@ duplicate_node_check(NodeStr) ->
case rabbit_nodes:names(NodeHost) of
{ok, NamePorts} ->
case proplists:is_defined(NodeName, NamePorts) of
- true -> io:format("node with name ~p "
+ true -> io:format("ERROR: node with name ~p "
"already running on ~p~n",
[NodeName, NodeHost]),
io:format(rabbit_nodes:diagnostics([Node]) ++ "~n"),
@@ -65,7 +65,8 @@ duplicate_node_check(NodeStr) ->
false -> ok
end;
{error, EpmdReason} ->
- rabbit_misc:quit("epmd error for host ~p: ~p (~s)~n",
+ io:format("ERROR: epmd error for host ~p: ~p (~s)~n",
[NodeHost, EpmdReason,
- rabbit_misc:format_inet_error(EpmdReason)])
+ rabbit_misc:format_inet_error(EpmdReason)]),
+ rabbit_misc:quit(?ERROR_CODE)
end.