summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-06-25 16:28:24 +0100
committerSimon MacMullen <simon@rabbitmq.com>2012-06-25 16:28:24 +0100
commit8ce0730455dbbda058fb8a2026bdb67612436a74 (patch)
tree5e86c9f33c8d82f8c3d933f741a230a361dc40e6
parent455bb262f1200c4164caef3894dfa967ec9dfd8d (diff)
downloadrabbitmq-server-git-8ce0730455dbbda058fb8a2026bdb67612436a74.tar.gz
Get rid of this with_exit_handler use.
-rw-r--r--src/rabbit_mirror_queue_slave.erl16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl
index df5f35adfa..481897e69c 100644
--- a/src/rabbit_mirror_queue_slave.erl
+++ b/src/rabbit_mirror_queue_slave.erl
@@ -358,18 +358,10 @@ handle_msg([SPid], _From, Msg) ->
ok = gen_server2:cast(SPid, {gm, Msg}).
inform_deaths(SPid, Deaths) ->
- %% TODO can we get rid of this with_exit_handler use? See bug
- %% 24988 comment 13.
- rabbit_misc:with_exit_handler(
- fun () -> {stop, normal} end,
- fun () ->
- case gen_server2:call(SPid, {gm_deaths, Deaths}, infinity) of
- ok ->
- ok;
- {promote, CPid} ->
- {become, rabbit_mirror_queue_coordinator, [CPid]}
- end
- end).
+ case gen_server2:call(SPid, {gm_deaths, Deaths}, infinity) of
+ ok -> ok;
+ {promote, CPid} -> {become, rabbit_mirror_queue_coordinator, [CPid]}
+ end.
%% ---------------------------------------------------------------------------
%% Others