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
commit5c1c20e4ee3289ecb7948aacac262ca6d2b8c43d (patch)
tree56c749fedf3e0ec1685e5f9c8bd6f065d623c0b0
parent51080c0d3e881bc8597e4966d28501447bd3f355 (diff)
parent461affc1b9a2082bf61315a04f3e24956c05b96b (diff)
downloadrabbitmq-server-git-5c1c20e4ee3289ecb7948aacac262ca6d2b8c43d.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 4cc9cd12f1..6a6a4ee680 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.