diff options
| author | Matthias Radestock <matthias@lshift.net> | 2010-04-12 12:22:51 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2010-04-12 12:22:51 +0100 |
| commit | 1dab90ba8b50902e3da172f05bd73bab95fb90b7 (patch) | |
| tree | a0fd91552bf7e3cbd20173d2cb6c7b9e0cb96e7a /src/rabbit.erl | |
| parent | 18be7aa751659004030380c963edaef929092ea2 (diff) | |
| download | rabbitmq-server-git-1dab90ba8b50902e3da172f05bd73bab95fb90b7.tar.gz | |
combine queue sup startup and recovery
There was actually no compelling reason to start up the sup earlier -
nothing needs it, not even the node_monitor that supposedly depended
on it.
This narrows the interface on amqqueue and brings 'default' closer to
the bug21673 branch.
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index b120499739..259ac0401a 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -91,12 +91,6 @@ {requires, kernel_ready}, {enables, core_initialized}]}). --rabbit_boot_step({rabbit_amqqueue_sup, - [{description, "queue supervisor"}, - {mfa, {rabbit_amqqueue, start, []}}, - {requires, kernel_ready}, - {enables, core_initialized}]}). - -rabbit_boot_step({rabbit_router, [{description, "cluster router"}, {mfa, {rabbit_sup, start_restartable_child, @@ -109,7 +103,6 @@ {mfa, {rabbit_sup, start_restartable_child, [rabbit_node_monitor]}}, {requires, kernel_ready}, - {requires, rabbit_amqqueue_sup}, {enables, core_initialized}]}). -rabbit_boot_step({core_initialized, @@ -125,14 +118,15 @@ {mfa, {rabbit_exchange, recover, []}}, {requires, empty_db_check}]}). --rabbit_boot_step({queue_recovery, - [{description, "queue recovery"}, - {mfa, {rabbit_amqqueue, recover, []}}, - {requires, exchange_recovery}]}). +-rabbit_boot_step({queue_sup_queue_recovery, + [{description, "queue supervisor and queue recovery"}, + {mfa, {rabbit_amqqueue, start, []}}, + {requires, empty_db_check}]}). -rabbit_boot_step({persister, - [{mfa, {rabbit_sup, start_child, [rabbit_persister]}}, - {requires, queue_recovery}]}). + [{mfa, {rabbit_sup, start_child, + [rabbit_persister]}}, + {requires, queue_sup_queue_recovery}]}). -rabbit_boot_step({guid_generator, [{description, "guid generator"}, |