summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2010-03-08 15:59:04 +0000
committerMatthias Radestock <matthias@lshift.net>2010-03-08 15:59:04 +0000
commit347781cea7a6d528c60dffa6c9cdd0e5024e2d5c (patch)
tree43adf470063333af20b83464675ebad252c1f597 /src/rabbit.erl
parent43acb2b32a8952fbb731e3698a99c26876f278ce (diff)
parentcb1a12dd4957b0c95e805174a28f0dcdf3688624 (diff)
downloadrabbitmq-server-git-347781cea7a6d528c60dffa6c9cdd0e5024e2d5c.tar.gz
merge bug22454 into default
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 94d852f921..ee39100adb 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -61,7 +61,7 @@
-rabbit_boot_step({rabbit_log,
[{description, "logging server"},
- {mfa, {rabbit_restartable_sup, start_child,
+ {mfa, {rabbit_sup, start_restartable_child,
[rabbit_log]}},
{enables, kernel_ready}]}).
@@ -87,14 +87,14 @@
-rabbit_boot_step({rabbit_router,
[{description, "cluster router"},
- {mfa, {rabbit_restartable_sup, start_child,
+ {mfa, {rabbit_sup, start_restartable_child,
[rabbit_router]}},
{requires, kernel_ready},
{enables, core_initialized}]}).
-rabbit_boot_step({rabbit_node_monitor,
[{description, "node monitor"},
- {mfa, {rabbit_restartable_sup, start_child,
+ {mfa, {rabbit_sup, start_restartable_child,
[rabbit_node_monitor]}},
{requires, kernel_ready},
{requires, rabbit_amqqueue_sup},
@@ -124,7 +124,7 @@
-rabbit_boot_step({guid_generator,
[{description, "guid generator"},
- {mfa, {rabbit_restartable_sup, start_child,
+ {mfa, {rabbit_sup, start_restartable_child,
[rabbit_guid]}},
{requires, persister},
{enables, routing_ready}]}).