summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-06-23 16:55:05 +0100
committerSimon MacMullen <simon@rabbitmq.com>2014-06-23 16:55:05 +0100
commit55469fac46463fb41de24cedc21daad631609c7a (patch)
tree56c749fedf3e0ec1685e5f9c8bd6f065d623c0b0
parent551f2512bcb1499b3c3b37ae225b09fc2b17d7e6 (diff)
parent0aa42aaa1dd5093b6a88c2c5ca3a662e92982f1c (diff)
downloadrabbitmq-server-55469fac46463fb41de24cedc21daad631609c7a.tar.gz
Merge bug 26258
-rw-r--r--src/rabbit_prelaunch.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl
index 4cc9cd12..6a6a4ee6 100644
--- a/src/rabbit_prelaunch.erl
+++ b/src/rabbit_prelaunch.erl
@@ -90,9 +90,9 @@ dist_port_set_check() ->
{none, none} -> ok;
_ -> rabbit_misc:quit(?DIST_PORT_CONFIGURED)
end;
+ {ok, _} ->
+ ok;
{error, _} ->
- %% TODO can we present errors more nicely here
- %% than after -config has failed?
ok
end
end.