diff options
| author | Tim Watson <watson.timothy@gmail.com> | 2014-02-18 13:55:51 +0000 |
|---|---|---|
| committer | Tim Watson <watson.timothy@gmail.com> | 2014-02-18 13:55:51 +0000 |
| commit | 08e583a2f127e151ed8ba8eda3dfd1abf1f545a9 (patch) | |
| tree | c7a968557c95b6421bb93f1dd03f55a71632b870 /src/rabbit.erl | |
| parent | 2df0129a194acf85173705cef6f1a136b6ef2596 (diff) | |
| download | rabbitmq-server-git-08e583a2f127e151ed8ba8eda3dfd1abf1f545a9.tar.gz | |
Simplifying refactor
Since the "rabbit" process /always/ starts before everything else,
handle boot table creation at that point and avoid the ets ownership
issue and corresponding messiness. The previous worries about handling
situations where we want to run rabbit_boot code whilst rabbit is
offline aren't an issue for us.
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 102d981572..3690329fe8 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -41,12 +41,6 @@ {requires, pre_boot}, {enables, external_infrastructure}]}). --rabbit_boot_step({boot_table, - [{mfa, {rabbit_sup, start_child, - [rabbit_boot_table, rabbit_boot, []]}}, - {requires, file_handle_cache}, - {enables, external_infrastructure}]}). - -rabbit_boot_step({database, [{mfa, {rabbit_mnesia, init, []}}, {requires, file_handle_cache}, @@ -425,6 +419,7 @@ start(normal, []) -> true = register(rabbit, self()), print_banner(), log_banner(), + rabbit_boot:prepare_boot_table(), rabbit_boot:run_boot_steps(), {ok, SupPid}; Error -> |