diff options
author | Matthias Radestock <matthias@rabbitmq.com> | 2013-01-17 18:47:34 +0000 |
---|---|---|
committer | Matthias Radestock <matthias@rabbitmq.com> | 2013-01-17 18:47:34 +0000 |
commit | 8ea1d6208a55a5e93e70515388a66f34f8948337 (patch) | |
tree | 54b6c891765db6c256653aacfbf0e5de644b36ff | |
parent | c720e3c00fdd00313f0770e23ba2d40875a1fd4c (diff) | |
download | rabbitmq-server-8ea1d6208a55a5e93e70515388a66f34f8948337.tar.gz |
simplifying refactor on rabbit_mnesia:discover_cluster
-rw-r--r-- | src/rabbit_mnesia.erl | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 6a442fec..d5efffa5 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -601,19 +601,16 @@ discover_cluster(Nodes) when is_list(Nodes) -> lists:foldl(fun (_, {ok, Res}) -> {ok, Res}; (Node, {error, _}) -> discover_cluster(Node) end, {error, no_nodes_provided}, Nodes); +discover_cluster(Node) when Node == node() -> + {error, {cannot_discover_cluster, "Cannot cluster node with itself"}}; discover_cluster(Node) -> OfflineError = {error, {cannot_discover_cluster, "The nodes provided are either offline or not running"}}, - case node() of - 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 + case rpc:call(Node, rabbit_mnesia, cluster_status_from_mnesia, []) of + {badrpc, _Reason} -> OfflineError; + {error, mnesia_not_running} -> OfflineError; + {ok, Res} -> {ok, Res} end. schema_ok_or_move() -> |