diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-02-08 14:00:22 +0000 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-02-08 14:00:22 +0000 |
| commit | 0aa1f7e5b8c6eafca9ed19acf9b729403066625a (patch) | |
| tree | b0e77c70e25b97f10931234d7495f524556e28d8 | |
| parent | 89f1a813cf468345aa1f8f8c9dd20ab42da2567d (diff) | |
| parent | e3896507c579837b43abac9f58ecfbe498d5a6a6 (diff) | |
| download | rabbitmq-server-git-0aa1f7e5b8c6eafca9ed19acf9b729403066625a.tar.gz | |
merge bug23814 into default (misc:with_exit_handler is missing a match for nodedown and shutdown)
| -rw-r--r-- | src/rabbit_misc.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 7d9167973d..e36b1dd12c 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. |