diff options
author | Simon MacMullen <simon@babysimon.co.uk> | 2012-11-21 14:09:43 +0000 |
---|---|---|
committer | Simon MacMullen <simon@babysimon.co.uk> | 2012-11-21 14:09:43 +0000 |
commit | f2b6a7d5bfc5376d4df491a36fa84ac8f56c963d (patch) | |
tree | 90090bb927d4fc940d841c5dd01c81a1163521ce | |
parent | 843c5b04b925e5a809ac908598ca0931b5743df1 (diff) | |
download | rabbitmq-server-f2b6a7d5bfc5376d4df491a36fa84ac8f56c963d.tar.gz |
Don't try to assert result of {add,drop}_mirror.
-rw-r--r-- | src/rabbit_mirror_queue_misc.erl | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl index 2b3bd027..2075f878 100644 --- a/src/rabbit_mirror_queue_misc.erl +++ b/src/rabbit_mirror_queue_misc.erl @@ -133,11 +133,11 @@ on_node_up() -> end end, [], rabbit_queue) end), - [{ok, _} = add_mirror(QName, node()) || QName <- QNames], + [add_mirror(QName, node()) || QName <- QNames], ok. drop_mirrors(QName, Nodes) -> - [{ok, _} = drop_mirror(QName, Node) || Node <- Nodes], + [drop_mirror(QName, Node) || Node <- Nodes], ok. drop_mirror(QName, MirrorNode) -> @@ -159,7 +159,7 @@ drop_mirror(QName, MirrorNode) -> end). add_mirrors(QName, Nodes) -> - [{ok, _} = add_mirror(QName, Node) || Node <- Nodes], + [add_mirror(QName, Node) || Node <- Nodes], ok. add_mirror(QName, MirrorNode) -> @@ -183,14 +183,6 @@ start_child(Name, MirrorNode, Q) -> fun () -> rabbit_mirror_queue_slave_sup:start_child(MirrorNode, [Q]) end) of - {ok, undefined} -> - %% this means the mirror process was - %% already running on the given node. - {ok, already_mirrored}; - {ok, down} -> - %% Node went down between us deciding to start a mirror - %% and actually starting it. Which is fine. - {ok, node_down}; {ok, SPid} -> rabbit_log:info("Adding mirror of ~s on node ~p: ~p~n", [rabbit_misc:rs(Name), MirrorNode, SPid]), |