diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-03-17 16:37:54 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-03-17 16:37:54 +0000 |
| commit | 544081a948a2ecc2e114dfb81aaf268cf10d966d (patch) | |
| tree | e6316b57b4b85af991774215c8415cdc6d9b4766 | |
| parent | d350c5ce08dff4f0ff64d5d294c00b0866932121 (diff) | |
| download | rabbitmq-server-544081a948a2ecc2e114dfb81aaf268cf10d966d.tar.gz | |
Improve symmetry: if we write the running_disc_nodes on rabbit shutdown, we should nuke it on rabbit startup. This then means that the prelaunch thingy is always run with the previously_running_disc_nodes file present. I believe this makes no semantic changes, but the improved symmetry is worth having
| -rw-r--r-- | src/rabbit.erl | 1 | ||||
| -rw-r--r-- | src/rabbit_upgrade.erl | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 5f88b997..1361d0f4 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -233,6 +233,7 @@ rotate_logs(BinarySuffix) -> start(normal, []) -> case erts_version_check() of ok -> + ok = rabbit_mnesia:delete_previously_running_disc_nodes(), {ok, SupPid} = rabbit_sup:start_link(), true = register(rabbit, self()), diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl index b4e1191e..20f53da2 100644 --- a/src/rabbit_upgrade.erl +++ b/src/rabbit_upgrade.erl @@ -112,8 +112,7 @@ maybe_upgrade_mnesia() -> primary -> primary_upgrade(Upgrades, AllNodes); secondary -> secondary_upgrade(AllNodes) end - end, - ok = rabbit_mnesia:delete_previously_running_disc_nodes(). + end. upgrade_mode(AllNodes) -> case nodes_running(AllNodes) of |