diff options
| author | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-05-18 11:14:30 +0100 |
|---|---|---|
| committer | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-05-18 11:14:30 +0100 |
| commit | e6a8155834034c60f100ddcf52fce62c792ed162 (patch) | |
| tree | 88e31a84a2ab9153646e7df96f8e2fc5bc38689d /src/rabbit.erl | |
| parent | bdd62ebd05e37de6bf38eef43d03c4bbca63602f (diff) | |
| parent | 350bf271a43b8717f66842a46c967af9160b84a8 (diff) | |
| download | rabbitmq-server-git-e6a8155834034c60f100ddcf52fce62c792ed162.tar.gz | |
merge default
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index eff2fac282..e4c196a359 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -60,7 +60,8 @@ -rabbit_boot_step({worker_pool, [{description, "worker pool"}, - {mfa, {rabbit_sup, start_child, [worker_pool_sup]}}, + {mfa, {rabbit_sup, start_supervisor_child, + [worker_pool_sup]}}, {requires, pre_boot}, {enables, external_infrastructure}]}). @@ -143,7 +144,8 @@ -rabbit_boot_step({mirror_queue_slave_sup, [{description, "mirror queue slave sup"}, - {mfa, {rabbit_mirror_queue_slave_sup, start, []}}, + {mfa, {rabbit_sup, start_supervisor_child, + [rabbit_mirror_queue_slave_sup]}}, {requires, recovery}, {enables, routing_ready}]}). @@ -541,7 +543,7 @@ boot_error(Format, Args) -> boot_delegate() -> {ok, Count} = application:get_env(rabbit, delegate_count), - rabbit_sup:start_child(delegate_sup, [Count]). + rabbit_sup:start_supervisor_child(delegate_sup, [Count]). recover() -> rabbit_binding:recover(rabbit_exchange:recover(), rabbit_amqqueue:start()). |