summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2011-03-14 16:57:10 +0000
committerMatthew Sackman <matthew@rabbitmq.com>2011-03-14 16:57:10 +0000
commitd29f522eb48119b25af21e4c4c665a7b48fc61e1 (patch)
treec5a747d6f6edb24258c85a5521235a7843983648 /src/rabbit.erl
parentdafce92cc24ff7f0b47b3d28be758ea7fa052c05 (diff)
parent0f78a913cec7e77f1ce844e25e118343a7b32f39 (diff)
downloadrabbitmq-server-git-d29f522eb48119b25af21e4c4c665a7b48fc61e1.tar.gz
Merging default into bug23554
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index c9a929ae00..0548d6bf09 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -36,6 +36,12 @@
[]}},
{enables, external_infrastructure}]}).
+-rabbit_boot_step({rabbit_registry,
+ [{description, "plugin registry"},
+ {mfa, {rabbit_sup, start_child,
+ [rabbit_registry]}},
+ {enables, external_infrastructure}]}).
+
-rabbit_boot_step({database,
[{mfa, {rabbit_mnesia, init, []}},
{requires, file_handle_cache},
@@ -55,13 +61,6 @@
-rabbit_boot_step({external_infrastructure,
[{description, "external infrastructure ready"}]}).
--rabbit_boot_step({rabbit_registry,
- [{description, "plugin registry"},
- {mfa, {rabbit_sup, start_child,
- [rabbit_registry]}},
- {requires, external_infrastructure},
- {enables, kernel_ready}]}).
-
-rabbit_boot_step({rabbit_log,
[{description, "logging server"},
{mfa, {rabbit_sup, start_restartable_child,