diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-04-05 15:17:48 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-04-05 15:17:48 +0300 |
| commit | 32e4955c5a6cdd829795c69e1fbfff9901eeb01e (patch) | |
| tree | 0567fc9665da7dd1381c6884c377ba282f432e9e /src/rabbit.erl | |
| parent | 14e2906bf37a3b87ab54021a5e40cbee796994b2 (diff) | |
| parent | a706a2ba08c16ba518a49844114e15bb41119846 (diff) | |
| download | rabbitmq-server-git-32e4955c5a6cdd829795c69e1fbfff9901eeb01e.tar.gz | |
Merge branch 'master' into rabbitmq-server-1143
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index f510985deb..b1546d4d7e 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -11,7 +11,7 @@ %% The Original Code is RabbitMQ. %% %% The Initial Developer of the Original Code is GoPivotal, Inc. -%% Copyright (c) 2007-2016 Pivotal Software, Inc. All rights reserved. +%% Copyright (c) 2007-2017 Pivotal Software, Inc. All rights reserved. %% -module(rabbit). @@ -481,7 +481,8 @@ stop_and_halt() -> try stop() catch Type:Reason -> - rabbit_log:error("Error trying to stop RabbitMQ: ~p:~p", [Type, Reason]) + rabbit_log:error("Error trying to stop RabbitMQ: ~p:~p", [Type, Reason]), + error({Type, Reason}) after AppsLeft = [ A || {A, _, _} <- application:which_applications() ], rabbit_log:info( |