diff options
| author | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-08-23 11:24:54 +0100 |
|---|---|---|
| committer | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-08-23 11:24:54 +0100 |
| commit | e217f7695d5fe84cdd571b253b4daa979e9a838f (patch) | |
| tree | 183f2e316f15a8efecc7d3e6e416b9de7c9321b9 | |
| parent | 52b0976b830b637611086523910d5dc66d35ebab (diff) | |
| download | rabbitmq-server-git-e217f7695d5fe84cdd571b253b4daa979e9a838f.tar.gz | |
little fixes to the automatic clustering config code
| -rw-r--r-- | src/rabbit_mnesia.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 5cfdd5e05c..dc27e58bdb 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -136,7 +136,6 @@ init() -> ok. normal_init(DiscNode, AllNodes) -> - DiscNode = is_disc_node(), init_db_and_upgrade(AllNodes, DiscNode, DiscNode). init_from_config() -> @@ -153,7 +152,7 @@ init_from_config() -> rabbit_log:warning("Could not find any suitable node amongst the " "ones provided in the configuration: ~p~n", [TryNodes]), - normal_init(DiscNode, [node()]) + normal_init(true, [node()]) end. %% Make the node join a cluster. The node will be reset automatically before we @@ -1169,7 +1168,7 @@ is_virgin_node() -> {ok, []} -> true; {ok, [File]} -> (dir() ++ "/" ++ File) =:= rabbit_node_monitor:cluster_status_file_name(); - {ok, Files} -> false + {ok, _} -> false end. find_good_node([]) -> |