summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2011-02-08 14:00:22 +0000
committerAlexandru Scvortov <alexandru@rabbitmq.com>2011-02-08 14:00:22 +0000
commita6a04ce0facbf2ab1d7d978783a0e52541f154f8 (patch)
treeb0e77c70e25b97f10931234d7495f524556e28d8
parent79b65907112277b1574c022ec9772eb55b63b288 (diff)
parent91014e9a0e590390f69a8b525e0043a58e6d2241 (diff)
downloadrabbitmq-server-a6a04ce0facbf2ab1d7d978783a0e52541f154f8.tar.gz
merge bug23814 into default (misc:with_exit_handler is missing a match for nodedown and shutdown)
-rw-r--r--src/rabbit_misc.erl7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index 7d916797..e36b1dd1 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -350,8 +350,11 @@ throw_on_error(E, Thunk) ->
with_exit_handler(Handler, Thunk) ->
try
Thunk()
- catch exit:{R, _} when R =:= noproc; R =:= nodedown;
- R =:= normal; R =:= shutdown ->
+ catch
+ exit:{R, _} when R =:= noproc; R =:= nodedown;
+ R =:= normal; R =:= shutdown ->
+ Handler();
+ exit:{{R, _}, _} when R =:= nodedown; R =:= shutdown ->
Handler()
end.