diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-02-01 15:12:53 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-02-01 15:12:53 +0000 |
| commit | a24696f90e186fde9f280899928af1c9bb870d64 (patch) | |
| tree | a8f478f77f920dd5c103fa24d871289f9e33c2f9 /src | |
| parent | 417d24df045910de2748337a71605ed94d194c9e (diff) | |
| download | rabbitmq-server-git-a24696f90e186fde9f280899928af1c9bb870d64.tar.gz | |
OTOH if we're not trying to cluster with anything we should probably be happy.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_mnesia.erl | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 75ad3dc8d9..0f9a6a7ac4 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -521,12 +521,13 @@ init_db(ClusterNodes, Force, SecondaryPostMnesiaFun) -> ProperClusterNodes = UClusterNodes -- [node()], case mnesia:change_config(extra_db_nodes, ProperClusterNodes) of {ok, Nodes} -> - case {Nodes, Force} of - {[], false} -> throw({error, {failed_to_cluster_with, - ProperClusterNodes, - "Mnesia could not connect " - "to any disc nodes."}}); - _ -> ok + case {ProperClusterNodes, Nodes, Force} of + {[], [], false} -> ok; + {_, [], false} -> throw({error, {failed_to_cluster_with, + ProperClusterNodes, + "Mnesia could not connect " + "to any disc nodes."}}); + _ -> ok end, WasDiscNode = is_disc_node(), WantDiscNode = should_be_disc_node(ClusterNodes), |