diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2017-09-28 16:18:31 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2017-09-28 16:18:31 +0300 |
| commit | 2ccd9717cd2d8ce1d51d42913b0c26894ddca535 (patch) | |
| tree | e632c7ebcbebb0cc0222ca29570feb20618b00d6 | |
| parent | 547be437426163fcd2655857e34f4d24b4994c3a (diff) | |
| download | rabbitmq-server-git-2ccd9717cd2d8ce1d51d42913b0c26894ddca535.tar.gz | |
Revert "Revert "Ensure that exit code 0 is used for "stop" command""
This reverts commit 547be437426163fcd2655857e34f4d24b4994c3a.
The change in 1518b601036351e3f8686bab9c8ae87a8d5af0a3 is in line with the expected
stop behavior in 3.6.x.
For 3.7.0 we are still contemplating what it should be.
| -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, _) -> |