diff options
| author | Matthias Radestock <matthias@lshift.net> | 2010-03-08 12:06:03 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2010-03-08 12:06:03 +0000 |
| commit | 66814729b3e136f2f90f9e9727373434a9eeb56b (patch) | |
| tree | 672805ebc80046fcaf762da40f847c6565e39042 /src/rabbit.erl | |
| parent | 0118ddda953a333f43b41245fd3104f234e826fe (diff) | |
| parent | cf25d3940f0c3c2fa54b0f424da4762d0db38cce (diff) | |
| download | rabbitmq-server-git-66814729b3e136f2f90f9e9727373434a9eeb56b.tar.gz | |
merge bug22454 into default
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 6084be1b24..94d852f921 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -61,7 +61,8 @@ -rabbit_boot_step({rabbit_log, [{description, "logging server"}, - {mfa, {rabbit_sup, start_child, [rabbit_log]}}, + {mfa, {rabbit_restartable_sup, start_child, + [rabbit_log]}}, {enables, kernel_ready}]}). -rabbit_boot_step({rabbit_hooks, @@ -86,13 +87,15 @@ -rabbit_boot_step({rabbit_router, [{description, "cluster router"}, - {mfa, {rabbit_sup, start_child, [rabbit_router]}}, + {mfa, {rabbit_restartable_sup, start_child, + [rabbit_router]}}, {requires, kernel_ready}, {enables, core_initialized}]}). -rabbit_boot_step({rabbit_node_monitor, [{description, "node monitor"}, - {mfa, {rabbit_sup, start_child, [rabbit_node_monitor]}}, + {mfa, {rabbit_restartable_sup, start_child, + [rabbit_node_monitor]}}, {requires, kernel_ready}, {requires, rabbit_amqqueue_sup}, {enables, core_initialized}]}). @@ -121,7 +124,8 @@ -rabbit_boot_step({guid_generator, [{description, "guid generator"}, - {mfa, {rabbit_sup, start_child, [rabbit_guid]}}, + {mfa, {rabbit_restartable_sup, start_child, + [rabbit_guid]}}, {requires, persister}, {enables, routing_ready}]}). |