From cfe2fa8ac5944b20d515da47f9e8793b1d61a2a2 Mon Sep 17 00:00:00 2001 From: Simon MacMullen Date: Thu, 19 Jun 2014 14:01:11 +0100 Subject: Don't explode if we have a file with 0 or 2+ Erlang terms. Also remove TODO, actually I don't think we can do better. --- src/rabbit_prelaunch.erl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl index 4cc9cd12..bb93ebe9 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; - {error, _} -> - %% TODO can we present errors more nicely here - %% than after -config has failed? + {ok, _} -> + ok; + {error, X} -> ok end end. -- cgit v1.2.1 From 0aa42aaa1dd5093b6a88c2c5ca3a662e92982f1c Mon Sep 17 00:00:00 2001 From: Simon MacMullen Date: Thu, 19 Jun 2014 14:09:28 +0100 Subject: Oops --- src/rabbit_prelaunch.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl index bb93ebe9..6a6a4ee6 100644 --- a/src/rabbit_prelaunch.erl +++ b/src/rabbit_prelaunch.erl @@ -92,7 +92,7 @@ dist_port_set_check() -> end; {ok, _} -> ok; - {error, X} -> + {error, _} -> ok end end. -- cgit v1.2.1