summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2011-01-20 13:46:52 +0000
committerMatthew Sackman <matthew@rabbitmq.com>2011-01-20 13:46:52 +0000
commitf65f537b218312531ca3d8562dec5ecb467a0481 (patch)
tree666c5193708f7282bfd3ef9e2b8564bd5e5b1b72 /src/rabbit.erl
parentfbd631733f2e25c8842292e48d956f09ca8040e1 (diff)
parentfa6928fc212f49818265cab198791389073a2119 (diff)
downloadrabbitmq-server-git-f65f537b218312531ca3d8562dec5ecb467a0481.tar.gz
Merging default into bug23554 (epic debitrot)
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 b041a6372c..57bec3317f 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,