summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2010-03-08 15:41:58 +0000
committerMatthew Sackman <matthew@lshift.net>2010-03-08 15:41:58 +0000
commitd656a8ccd03fe76eaf5d911ae759ce0aadbed2ca (patch)
treeb4a8f533935a2e2f503c38db7eb0691d70d3ae36 /src/rabbit.erl
parent2908a1ea8281ffbb426ffde3366fd93381288349 (diff)
parentcb1a12dd4957b0c95e805174a28f0dcdf3688624 (diff)
downloadrabbitmq-server-git-d656a8ccd03fe76eaf5d911ae759ce0aadbed2ca.tar.gz
Merging bug 22454 into bug 22456
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 326893ca22..700acede24 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}]}).