summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2010-12-21 00:42:39 +0000
committerMatthew Sackman <matthew@rabbitmq.com>2010-12-21 00:42:39 +0000
commit035d4992771be3e4eb976ad8aade9aedc50f2b83 (patch)
treedcc6999d7831842695b370f3d0a2a224021ac745 /src/rabbit.erl
parentd8c90b7c540bb04250222bae9ec744b06552b1c5 (diff)
parent70aac947f7eb5320fb27792af203f0e201dfd7ba (diff)
downloadrabbitmq-server-git-035d4992771be3e4eb976ad8aade9aedc50f2b83.tar.gz
Merging default into bug 23554
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 2ebfdecf20..d46c62b6d9 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -51,6 +51,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, []}},
{enables, external_infrastructure}]}).
@@ -69,13 +75,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,