summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2011-02-12 20:54:33 +0000
committerMatthew Sackman <matthew@rabbitmq.com>2011-02-12 20:54:33 +0000
commit970bab419d2b9ac53a6e619c28455ddcd6f611d8 (patch)
treeae05e44dedc9bcaf2865a9f0ac8c44252f3ff9bf /src/rabbit.erl
parent18e02d755fa9d0d5279b76fcfbedc40bb06cc036 (diff)
parent5d048144d014ef181bccfecbcad20b90fef92f7b (diff)
downloadrabbitmq-server-git-970bab419d2b9ac53a6e619c28455ddcd6f611d8.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 1beed5c1a7..d967cfb9cd 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, []}},
{enables, external_infrastructure}]}).
@@ -54,13 +60,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,