summaryrefslogtreecommitdiff
path: root/src/rabbit_mirror_queue_master.erl
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-11-29 12:05:23 +0000
committerSimon MacMullen <simon@rabbitmq.com>2012-11-29 12:05:23 +0000
commit4debb61fb625758cb850d2cf27af93e2cd00b0ea (patch)
treefff30b3cffa2c6cc0d8b33e7ee8c59a7304fed53 /src/rabbit_mirror_queue_master.erl
parent9102940de6158c4829156322318aaf33c40c56cb (diff)
downloadrabbitmq-server-4debb61fb625758cb850d2cf27af93e2cd00b0ea.tar.gz
Only respond to 'EXIT's from parent / syncer.
Diffstat (limited to 'src/rabbit_mirror_queue_master.erl')
-rw-r--r--src/rabbit_mirror_queue_master.erl11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl
index 0820f3f9..2f9f4c02 100644
--- a/src/rabbit_mirror_queue_master.erl
+++ b/src/rabbit_mirror_queue_master.erl
@@ -139,10 +139,13 @@ sync_mirrors(State = #state { name = QName,
gm:broadcast(GM, {sync_start, Ref, Syncer}),
S = fun(BQSN) -> State#state{backing_queue_state = BQSN} end,
case rabbit_mirror_queue_sync:master_go(Syncer, Ref, QName, BQ, BQS) of
- {shutdown, R, BQS1} -> {stop, R, S(BQS1)};
- {ok, BQS1} -> rabbit_log:info("Synchronising ~s: complete~n",
- [rabbit_misc:rs(QName)]),
- {ok, S(BQS1)}
+ {shutdown, R, BQS1} -> {stop, R, S(BQS1)};
+ {sync_died, R, BQS1} -> rabbit_log:info("Synchronising ~s: ~p~n",
+ [rabbit_misc:rs(QName), R]),
+ {ok, S(BQS1)};
+ {ok, BQS1} -> rabbit_log:info("Synchronising ~s: complete~n",
+ [rabbit_misc:rs(QName)]),
+ {ok, S(BQS1)}
end.
terminate({shutdown, dropped} = Reason,