diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-11-13 16:33:27 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-11-13 16:33:27 +0000 |
| commit | f7405cce978ae12868927910a6fdfe1d0c2d44df (patch) | |
| tree | 7643dff8972807a4f4be41fe5e2e3ea79b5f1c7c /src | |
| parent | 03160aa26d0906212808be93fddb7879ea81a8c0 (diff) | |
| parent | 7346a8252ef5b6b9a32161a7e03b228daac062db (diff) | |
| download | rabbitmq-server-git-f7405cce978ae12868927910a6fdfe1d0c2d44df.tar.gz | |
Merge bug25251 (very late!)
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_mirror_queue_misc.erl | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl index 8cc8d08bb6..2f75ef2ea9 100644 --- a/src/rabbit_mirror_queue_misc.erl +++ b/src/rabbit_mirror_queue_misc.erl @@ -141,7 +141,7 @@ drop_mirrors(QName, Nodes) -> ok. drop_mirror(QName, MirrorNode) -> - if_mirrored_queue( + rabbit_amqqueue:with( QName, fun (#amqqueue { name = Name, pid = QPid, slave_pids = SPids }) -> case [Pid || Pid <- [QPid | SPids], node(Pid) =:= MirrorNode] of @@ -163,7 +163,7 @@ add_mirrors(QName, Nodes) -> ok. add_mirror(QName, MirrorNode) -> - if_mirrored_queue( + rabbit_amqqueue:with( QName, fun (#amqqueue { name = Name, pid = QPid, slave_pids = SPids } = Q) -> case [Pid || Pid <- [QPid | SPids], node(Pid) =:= MirrorNode] of @@ -206,15 +206,6 @@ start_child(Name, MirrorNode, Q) -> Other end. -if_mirrored_queue(QName, Fun) -> - rabbit_amqqueue:with(QName, fun (Q) -> - case is_mirrored(Q) of - false -> ok; - true -> Fun(Q) - end - end, - fun (E) -> {ok, E} end). - report_deaths(_MirrorPid, _IsMaster, _QueueName, []) -> ok; report_deaths(MirrorPid, IsMaster, QueueName, DeadPids) -> |