diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-10-26 15:31:50 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-10-26 15:31:50 +0100 |
| commit | 2ae42dd8a6abcdecbcfe53ef946774f2b4691821 (patch) | |
| tree | cbf82412959719541dc296afb17dc195c5ce5d1a /src/rabbit_mirror_queue_misc.erl | |
| parent | 567ea52b3b202c2fb8a78199a8ba986757735ec5 (diff) | |
| download | rabbitmq-server-2ae42dd8a6abcdecbcfe53ef946774f2b4691821.tar.gz | |
Yet another way in which add_mirror / drop_mirror "failing" can be OK really.bug25236
Diffstat (limited to 'src/rabbit_mirror_queue_misc.erl')
| -rw-r--r-- | src/rabbit_mirror_queue_misc.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl index 8a363f76..80e49008 100644 --- a/src/rabbit_mirror_queue_misc.erl +++ b/src/rabbit_mirror_queue_misc.erl @@ -137,7 +137,7 @@ on_node_up() -> ok. drop_mirrors(QName, Nodes) -> - [ok = drop_mirror(QName, Node) || Node <- Nodes], + [{ok, _} = drop_mirror(QName, Node) || Node <- Nodes], ok. drop_mirror(QName, MirrorNode) -> @@ -154,7 +154,7 @@ drop_mirror(QName, MirrorNode) -> "Dropping queue mirror on node ~p for ~s~n", [MirrorNode, rabbit_misc:rs(Name)]), exit(Pid, {shutdown, dropped}), - ok + {ok, dropped} end end). @@ -212,7 +212,8 @@ if_mirrored_queue(QName, Fun) -> false -> ok; true -> Fun(Q) end - end). + end, + rabbit_misc:const({ok, not_found})). report_deaths(_MirrorPid, _IsMaster, _QueueName, []) -> ok; |