summaryrefslogtreecommitdiff
path: root/src/rabbit_mirror_queue_sync.erl
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-11-29 14:11:56 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2012-11-29 14:11:56 +0000
commit69f561481424051a2e456c4138af9e0d22790d7b (patch)
tree99c976184a97a896e58ab2e362446064745ec9f0 /src/rabbit_mirror_queue_sync.erl
parent8a2c6dac21a2a99b7fcbc73ed2831c37475802a5 (diff)
downloadrabbitmq-server-69f561481424051a2e456c4138af9e0d22790d7b.tar.gz
cosmetic
Diffstat (limited to 'src/rabbit_mirror_queue_sync.erl')
-rw-r--r--src/rabbit_mirror_queue_sync.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_mirror_queue_sync.erl b/src/rabbit_mirror_queue_sync.erl
index bddfb9dc..3a8a68b8 100644
--- a/src/rabbit_mirror_queue_sync.erl
+++ b/src/rabbit_mirror_queue_sync.erl
@@ -63,10 +63,10 @@ master_go(Syncer, Ref, Log, BQ, BQS) ->
BQ:fold(fun (Msg, MsgProps, {I, Last}) ->
master_send(SendArgs, I, Last, Msg, MsgProps)
end, {0, erlang:now()}, BQS),
- Syncer ! {done, Ref},
receive
{next, Ref} -> ok
end,
+ Syncer ! {done, Ref},
case Acc of
{shutdown, Reason} -> {shutdown, Reason, BQS1};
{sync_died, Reason} -> {sync_died, Reason, BQS1};
@@ -89,8 +89,8 @@ master_send({Syncer, Ref, Log, Parent}, I, Last, Msg, MsgProps) ->
receive
{next, Ref} -> Syncer ! {msg, Ref, Msg, MsgProps},
{cont, Acc};
- {'EXIT', Syncer, Reason} -> {stop, {sync_died, Reason}};
- {'EXIT', Parent, Reason} -> {stop, {shutdown, Reason}}
+ {'EXIT', Parent, Reason} -> {stop, {shutdown, Reason}};
+ {'EXIT', Syncer, Reason} -> {stop, {sync_died, Reason}}
end.
%% Master
@@ -139,7 +139,7 @@ foreach_slave(SPidsMRefs, Ref, Fun) ->
sync_receive_ready(SPid, MRef, Ref) ->
receive
{sync_ready, Ref, SPid} -> SPid;
- {sync_deny, Ref, SPid} -> ignore;
+ {sync_deny, Ref, SPid} -> ignore;
{'DOWN', MRef, _, SPid, _} -> ignore
end.