diff options
| author | Michael Bridgen <mikeb@lshift.net> | 2010-03-08 13:50:23 +0000 |
|---|---|---|
| committer | Michael Bridgen <mikeb@lshift.net> | 2010-03-08 13:50:23 +0000 |
| commit | 65aada05ad2ddb6bf4bec5c47c44f879234abce3 (patch) | |
| tree | fffce2100ac030cf5c6b1ddb248b6b5fa16e99ca /src/rabbit.erl | |
| parent | b54755ae7aad85157e3e7c4cbc5636634a5751f7 (diff) | |
| parent | 66814729b3e136f2f90f9e9727373434a9eeb56b (diff) | |
| download | rabbitmq-server-git-65aada05ad2ddb6bf4bec5c47c44f879234abce3.tar.gz | |
Merge default in
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 35d3ce4a5a..94d852f921 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -53,9 +53,16 @@ [{mfa, {rabbit_mnesia, init, []}}, {enables, kernel_ready}]}). +-rabbit_boot_step({rabbit_exchange_type_registry, + [{description, "exchange type registry"}, + {mfa, {rabbit_sup, start_child, + [rabbit_exchange_type_registry]}}, + {enables, kernel_ready}]}). + -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, @@ -80,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}]}). @@ -115,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}]}). |