diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2017-09-30 13:09:05 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2017-09-30 13:09:05 +0300 |
| commit | 43edeb93dbef0f0f1e6f66f98da43bf908f0933a (patch) | |
| tree | 7ac12faee12e1c4bea6e3ab010e81b047b4c8952 | |
| parent | 155eb6b0bffe3126ab18ab228296821ce0dc1f8c (diff) | |
| parent | 2ccd9717cd2d8ce1d51d42913b0c26894ddca535 (diff) | |
| download | rabbitmq-server-git-43edeb93dbef0f0f1e6f66f98da43bf908f0933a.tar.gz | |
Merge branch 'stable' into always-prioritise-consumers
| -rw-r--r-- | src/rabbit_cli.erl | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/rabbit_cli.erl b/src/rabbit_cli.erl index 4d955f82ac..da29136853 100644 --- a/src/rabbit_cli.erl +++ b/src/rabbit_cli.erl @@ -122,15 +122,12 @@ main(ParseFun, DoFun, UsageMod) -> _ -> print_error("unable to connect to node ~w: ~w", [Node, Reason]), print_badrpc_diagnostics([Node]), - case Command of - stop -> rabbit_misc:quit(?EX_OK); - _ -> rabbit_misc:quit(?EX_UNAVAILABLE) - end + exit_badrpc(Command) end; {badrpc_multi, Reason, Nodes} -> print_error("unable to connect to nodes ~p: ~w", [Nodes, Reason]), print_badrpc_diagnostics(Nodes), - rabbit_misc:quit(?EX_UNAVAILABLE); + exit_badrpc(Command); function_clause -> print_error("operation ~w used with invalid parameter: ~p", [Command, Args]), @@ -143,6 +140,11 @@ main(ParseFun, DoFun, UsageMod) -> rabbit_misc:quit(?EX_SOFTWARE) end. +exit_badrpc(stop) -> + rabbit_misc:quit(?EX_OK); +exit_badrpc(_) -> + rabbit_misc:quit(?EX_UNAVAILABLE). + start_distribution_anon(0, LastError) -> {error, LastError}; start_distribution_anon(TriesLeft, _) -> |