diff options
| -rw-r--r-- | src/rabbit_mnesia.erl | 26 | ||||
| -rw-r--r-- | src/rabbit_node_monitor.erl | 6 |
2 files changed, 14 insertions, 18 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 1a2c70fa8d..b3546483f6 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -643,9 +643,9 @@ check_cluster_consistency(Node) -> %%-------------------------------------------------------------------- on_node_up(Node) -> - case running_disc_nodes() =:= [Node] of - true -> rabbit_log:info("cluster contains disc nodes again~n"); - false -> ok + case running_disc_nodes() of + [Node] -> rabbit_log:info("cluster contains disc nodes again~n"); + _ -> ok end. on_node_down(_Node) -> @@ -670,18 +670,16 @@ discover_cluster(Nodes) when is_list(Nodes) -> discover_cluster(Node) -> OfflineError = {error, {cannot_discover_cluster, - "The nodes provided is either offline or not running"}}, + "The nodes provided are either offline or not running"}}, case node() of - Node-> - {error, {cannot_discover_cluster, - "You provided the current node as node to cluster with"}}; - _ -> - case rpc:call(Node, - rabbit_mnesia, cluster_status_from_mnesia, []) of - {badrpc, _Reason} -> OfflineError; - {error, mnesia_not_running} -> OfflineError; - {ok, Res} -> {ok, Res} - end + Node -> {error, {cannot_discover_cluster, + "Cannot cluster node with itself"}}; + _ -> case rpc:call(Node, + rabbit_mnesia, cluster_status_from_mnesia, []) of + {badrpc, _Reason} -> OfflineError; + {error, mnesia_not_running} -> OfflineError; + {ok, Res} -> {ok, Res} + end end. %% The tables aren't supposed to be on disk on a ram node diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl index c1572762a6..efbe57c004 100644 --- a/src/rabbit_node_monitor.erl +++ b/src/rabbit_node_monitor.erl @@ -291,8 +291,6 @@ legacy_cluster_nodes(Nodes) -> legacy_should_be_disc_node(DiscNodes) -> DiscNodes == [] orelse lists:member(node(), DiscNodes). -add_node(Node, Nodes) -> - lists:usort([Node|Nodes]). +add_node(Node, Nodes) -> lists:usort([Node | Nodes]). -del_node(Node, Nodes) -> - Nodes -- [Node]. +del_node(Node, Nodes) -> Nodes -- [Node]. |