summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Mazzoli <francesco@rabbitmq.com>2012-10-02 13:16:40 +0100
committerFrancesco Mazzoli <francesco@rabbitmq.com>2012-10-02 13:16:40 +0100
commit9b3a5bc27649c231eb9d97e3f38b5f759641e9e5 (patch)
tree3eed5325e2c2f271b8338f4be2f54dab91cea7c2
parenta94dc7e4676021ce93aa1006d8445e77aaefbd8c (diff)
downloadrabbitmq-server-9b3a5bc27649c231eb9d97e3f38b5f759641e9e5.tar.gz
simplify `leave_cluster/0'
-rw-r--r--src/rabbit_mnesia.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index bfecf06a..7ec678b5 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -666,10 +666,10 @@ remove_node_if_mnesia_running(Node) ->
end.
leave_cluster() ->
- RunningNodes = running_nodes(nodes_excl_me(cluster_nodes(all))),
- case not is_clustered() andalso RunningNodes =:= [] of
- true -> ok;
- false -> case lists:any(fun leave_cluster/1, RunningNodes) of
+ AllNodes = nodes_excl_me(cluster_nodes(all)),
+ case AllNodes of
+ [] -> ok;
+ _ -> case lists:any(fun leave_cluster/1, AllNodes) of
true -> ok;
false -> e(no_running_cluster_nodes)
end