diff options
| author | Matthias Radestock <matthias@lshift.net> | 2010-04-27 12:58:51 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2010-04-27 12:58:51 +0100 |
| commit | d1d73c58024f42b9b16fa6fd6ff0e00e46838c0b (patch) | |
| tree | 56147c20a8c8aca22b86731e920a832602338758 /src/rabbit.erl | |
| parent | 2863a4581e0032bd267f196c1ac3a73168f7f5bd (diff) | |
| parent | 0c27fe84074529409350dc8eb56519390434a396 (diff) | |
| download | rabbitmq-server-git-d1d73c58024f42b9b16fa6fd6ff0e00e46838c0b.tar.gz | |
merge default into bug22616
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index a1df3d2207..fe970675e0 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -47,7 +47,8 @@ [{description, "codec correctness check"}, {mfa, {rabbit_binary_generator, check_empty_content_body_frame_size, - []}}]}). + []}}, + {enables, external_infrastructure}]}). -rabbit_boot_step({database, [{mfa, {rabbit_mnesia, init, []}}, @@ -65,21 +66,21 @@ [{description, "exchange type registry"}, {mfa, {rabbit_sup, start_child, [rabbit_exchange_type_registry]}}, - {enables, kernel_ready}, - {requires, external_infrastructure}]}). + {requires, external_infrastructure}, + {enables, kernel_ready}]}). -rabbit_boot_step({rabbit_log, [{description, "logging server"}, {mfa, {rabbit_sup, start_restartable_child, [rabbit_log]}}, - {enables, kernel_ready}, - {requires, external_infrastructure}]}). + {requires, external_infrastructure}, + {enables, kernel_ready}]}). -rabbit_boot_step({rabbit_hooks, [{description, "internal event notification system"}, {mfa, {rabbit_hooks, start, []}}, - {enables, kernel_ready}, - {requires, external_infrastructure}]}). + {requires, external_infrastructure}, + {enables, kernel_ready}]}). -rabbit_boot_step({kernel_ready, [{description, "kernel ready"}, @@ -120,35 +121,36 @@ {enables, core_initialized}]}). -rabbit_boot_step({core_initialized, - [{description, "core initialized"}]}). + [{description, "core initialized"}, + {requires, kernel_ready}]}). -rabbit_boot_step({empty_db_check, [{description, "empty DB check"}, {mfa, {?MODULE, maybe_insert_default_data, []}}, - {requires, core_initialized}]}). + {requires, core_initialized}, + {enables, routing_ready}]}). -rabbit_boot_step({exchange_recovery, [{description, "exchange recovery"}, {mfa, {rabbit_exchange, recover, []}}, - {requires, empty_db_check}]}). + {requires, empty_db_check}, + {enables, routing_ready}]}). -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_sup_queue_recovery}]}). + {requires, empty_db_check}, + {enables, routing_ready}]}). -rabbit_boot_step({routing_ready, - [{description, "message delivery logic ready"}]}). + [{description, "message delivery logic ready"}, + {requires, core_initialized}]}). -rabbit_boot_step({log_relay, [{description, "error log relay"}, {mfa, {rabbit_error_logger, boot, []}}, - {requires, routing_ready}]}). + {requires, routing_ready}, + {enables, networking}]}). -rabbit_boot_step({networking, [{mfa, {rabbit_networking, boot, []}}, |