diff options
| author | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-05-24 16:54:29 +0100 |
|---|---|---|
| committer | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-05-24 16:54:29 +0100 |
| commit | 2615ad8ffad7f5c149bb789b2c7cd35f73a995fe (patch) | |
| tree | 7d1c25bc1b570d7d737f2cd71bf7be6ab922a591 /src/rabbit.erl | |
| parent | fe8f40694309eaa940dbbe0bc9dca96d6e77d42b (diff) | |
| download | rabbitmq-server-git-2615ad8ffad7f5c149bb789b2c7cd35f73a995fe.tar.gz | |
handle legacy `cluster_nodes.config' and `running_nodes_at_shutdown'
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index e4c196a359..d5a2b79201 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -288,8 +288,7 @@ split0([I | Is], [L | Ls]) -> split0(Is, Ls ++ [[I | L]]). prepare() -> ok = ensure_working_log_handlers(), ok = rabbit_mnesia:ensure_mnesia_dir(), - ok = rabbit_mnesia:initialize_cluster_nodes_status(), - ok = rabbit_mnesia:check_cluster_consistency(), + ok = rabbit_mnesia:prepare(), ok = rabbit_upgrade:maybe_upgrade_mnesia(). start() -> @@ -514,7 +513,7 @@ sort_boot_steps(UnsortedSteps) -> end. boot_step_error({error, {timeout_waiting_for_tables, _}}, _Stacktrace) -> - {AllNodes, _, _} = rabbit_mnesia:read_cluster_nodes_status(), + AllNodes = rabbit_mnesia:all_clustered_nodes(), {Err, Nodes} = case AllNodes -- [node()] of [] -> {"Timeout contacting cluster nodes. Since RabbitMQ was" |