diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-02-16 16:46:39 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-02-16 16:46:39 +0000 |
| commit | 6c69c9407328de4e224070c05f410b9490bd2092 (patch) | |
| tree | 039fd307b04de634e02e7072402ff9e94154e58c /src | |
| parent | 53aaaf5c9bf3459adfc3791ad13e5bd41e1a3b9e (diff) | |
| download | rabbitmq-server-git-6c69c9407328de4e224070c05f410b9490bd2092.tar.gz | |
Revert where rabbit:prepare happens.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_prelaunch.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_upgrade.erl | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl index 612aec8000..3283e8fd28 100644 --- a/src/rabbit_prelaunch.erl +++ b/src/rabbit_prelaunch.erl @@ -235,6 +235,8 @@ post_process_script(ScriptFile) -> {error, {failed_to_load_script, Reason}} end. +process_entry(Entry = {apply,{application,start_boot,[rabbit,permanent]}}) -> + [{apply,{rabbit,prepare,[]}}, Entry]; process_entry(Entry = {apply,{application,start_boot,[mnesia,permanent]}}) -> [{apply,{rabbit_upgrade,maybe_upgrade_mnesia,[]}}, Entry]; process_entry(Entry) -> diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl index c8d2ae877d..73b9bb0e7e 100644 --- a/src/rabbit_upgrade.erl +++ b/src/rabbit_upgrade.erl @@ -46,7 +46,6 @@ %% ------------------------------------------------------------------- maybe_upgrade_mnesia() -> - rabbit:prepare(), Nodes = rabbit_mnesia:all_clustered_nodes(), case upgrades_required(mnesia) of version_not_available -> |