diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2017-10-25 07:08:10 -0700 |
|---|---|---|
| committer | Luke Bakken <lbakken@pivotal.io> | 2017-10-25 07:08:10 -0700 |
| commit | 60487ec7a2c6ab1f5c90504272bad277c49e7053 (patch) | |
| tree | ba7cab58ffb1da5266128befbaa4c4bccf9aefab | |
| parent | a05d60f2cd93c94f0f0d9376ff3c25f34f82b62a (diff) | |
| download | rabbitmq-server-git-60487ec7a2c6ab1f5c90504272bad277c49e7053.tar.gz | |
Handle catch all (error) case
| -rw-r--r-- | src/rabbit.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_control_main.erl | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 8e3601da3b..4a9ae6ba76 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -450,8 +450,7 @@ stop() -> stop_and_halt() -> try - stop(), - exit(whoops_something_went_wrong) %% TODO REMOVE THIS QA ONLY + stop() catch Type:Reason -> rabbit_log:error("Error trying to stop RabbitMQ: ~p:~p", [Type, Reason]), erlang:error({Type, Reason}) diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index c30c9b8f45..934821891b 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -287,8 +287,8 @@ shutdown_node_and_wait_pid_to_stop(Node, Pid, Inform) -> Res; {badrpc, {'EXIT', RpcErr}} -> {error, {error_during_shutdown, RpcErr}}; - _ -> - Res + Error -> + {error, {error_during_shutdown, Error}} end. action(shutdown, Node, [], _Opts, Inform) -> @@ -297,7 +297,8 @@ action(shutdown, Node, [], _Opts, Inform) -> shutdown_node_and_wait_pid_to_stop(Node, Pid, Inform); {badrpc, {'EXIT', RpcErr}} -> {error, {error_during_shutdown, RpcErr}}; - Error -> Error + Error -> + {error, {error_during_shutdown, Error}} end; action(stop, Node, Args, _Opts, Inform) -> |