summaryrefslogtreecommitdiff
path: root/src/rabbit_mirror_queue_misc.erl
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-11-13 16:31:56 +0000
committerSimon MacMullen <simon@rabbitmq.com>2012-11-13 16:31:56 +0000
commit63b23cb52441ec10a9ad59b70d00d7b4c9a16c47 (patch)
tree7643dff8972807a4f4be41fe5e2e3ea79b5f1c7c /src/rabbit_mirror_queue_misc.erl
parent9bc892f59c5e0f77478f6e5c698dc75c85689789 (diff)
parent1eaf312254ef6ca0ba19376827c589708d776fc0 (diff)
downloadrabbitmq-server-63b23cb52441ec10a9ad59b70d00d7b4c9a16c47.tar.gz
Merge in defaultbug25251
Diffstat (limited to 'src/rabbit_mirror_queue_misc.erl')
-rw-r--r--src/rabbit_mirror_queue_misc.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl
index ec00ecef..2f75ef2e 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).