summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Wragg <david@rabbitmq.com>2011-02-22 03:24:56 +0000
committerDavid Wragg <david@rabbitmq.com>2011-02-22 03:24:56 +0000
commit35fc07b3387e7a23c104eb906d46af499cd5db9e (patch)
tree679a6a544d4e3782a4227a77d8152c730df41f3e
parent8ebfa5137cb826a70afaa602653b909ded0a0052 (diff)
parent70a29e4286b3628841fd9594b755d2fb72e8d237 (diff)
downloadrabbitmq-server-35fc07b3387e7a23c104eb906d46af499cd5db9e.tar.gz
Merge default into bug23568
-rw-r--r--src/rabbit.erl6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 1beed5c1..d8e5e2c5 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -29,26 +29,32 @@
%% Boot steps.
-export([maybe_insert_default_data/0, boot_delegate/0]).
+-rabbit_boot_step({pre_boot, [{description, "rabbit boot start"}]}).
+
-rabbit_boot_step({codec_correctness_check,
[{description, "codec correctness check"},
{mfa, {rabbit_binary_generator,
check_empty_content_body_frame_size,
[]}},
+ {requires, pre_boot},
{enables, external_infrastructure}]}).
-rabbit_boot_step({database,
[{mfa, {rabbit_mnesia, init, []}},
+ {requires, pre_boot},
{enables, external_infrastructure}]}).
-rabbit_boot_step({file_handle_cache,
[{description, "file handle cache server"},
{mfa, {rabbit_sup, start_restartable_child,
[file_handle_cache]}},
+ {requires, pre_boot},
{enables, worker_pool}]}).
-rabbit_boot_step({worker_pool,
[{description, "worker pool"},
{mfa, {rabbit_sup, start_child, [worker_pool_sup]}},
+ {requires, pre_boot},
{enables, external_infrastructure}]}).
-rabbit_boot_step({external_infrastructure,