diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-02-02 13:03:53 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-02-02 13:03:53 +0000 |
| commit | 7d17ae130affe0a7dd626e4db18159f8e6b71db6 (patch) | |
| tree | 45e5e572dea13652efa5a6e1b0d6380f16152191 | |
| parent | 4e3488a0b26afc2ff61d478046d39dc357403d99 (diff) | |
| download | rabbitmq-server-git-7d17ae130affe0a7dd626e4db18159f8e6b71db6.tar.gz | |
Remove nodes file immediately after starting Mnesia.
| -rw-r--r-- | src/rabbit.erl | 1 | ||||
| -rw-r--r-- | src/rabbit_mnesia.erl | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 01ca2302f4..9d00fe6637 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -365,7 +365,6 @@ start(normal, []) -> true = register(rabbit, self()), print_banner(), [ok = run_boot_step(Step) || Step <- boot_steps()], - ok = rabbit_mnesia:delete_previously_running_nodes(), io:format("~nbroker running~n"), {ok, SupPid}; Error -> diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 0f33a38a06..4314d9e938 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -23,8 +23,8 @@ empty_ram_only_tables/0, copy_db/1, wait_for_tables/1, create_cluster_nodes_config/1, read_cluster_nodes_config/0, record_running_nodes/0, read_previously_running_nodes/0, - delete_previously_running_nodes/0, running_nodes_filename/0, - is_disc_node/0, on_node_down/1, on_node_up/1]). + running_nodes_filename/0, is_disc_node/0, on_node_down/1, + on_node_up/1]). -export([table_names/0]). @@ -64,7 +64,6 @@ -spec(read_cluster_nodes_config/0 :: () -> [node()]). -spec(record_running_nodes/0 :: () -> 'ok'). -spec(read_previously_running_nodes/0 :: () -> [node()]). --spec(delete_previously_running_nodes/0 :: () -> 'ok'). -spec(running_nodes_filename/0 :: () -> file:filename()). -spec(is_disc_node/0 :: () -> boolean()). -spec(on_node_up/1 :: (node()) -> 'ok'). @@ -104,6 +103,7 @@ init() -> %% Mnesia is up. In fact that's not guaranteed to be the case - let's %% make it so. ok = global:sync(), + ok = delete_previously_running_nodes(), ok. is_db_empty() -> |