diff options
| author | Michael Klishin <michael@novemberain.com> | 2017-09-28 10:59:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 10:59:51 +0300 |
| commit | 644c9afd151dc963b4d6a47a5e3a1d28896499ca (patch) | |
| tree | e632c7ebcbebb0cc0222ca29570feb20618b00d6 /src | |
| parent | 1c81095486f56ca9dcfa19177594d6e5be1fbe0a (diff) | |
| parent | 1518b601036351e3f8686bab9c8ae87a8d5af0a3 (diff) | |
| download | rabbitmq-server-git-644c9afd151dc963b4d6a47a5e3a1d28896499ca.tar.gz | |
Merge pull request #1376 from rabbitmq/rabbitmq-server-1362
Ensure that exit code 0 is used for "stop" command
Diffstat (limited to 'src')
| -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, _) -> |