diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-07-26 17:24:59 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-07-26 17:24:59 +0100 |
| commit | 5d4e44fb9b6c0d382cf0c2b96426f03b3558768e (patch) | |
| tree | b21abf5d2c323305bb82e11c238157669b9590ac | |
| parent | 39fd0c69972d53f0ca3fb07a56e95e2d1f8a573f (diff) | |
| download | rabbitmq-server-git-5d4e44fb9b6c0d382cf0c2b96426f03b3558768e.tar.gz | |
Move ha boot steps to somewhere more appropriate
| -rw-r--r-- | src/rabbit.erl | 12 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_slave_sup.erl | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 6ef816c0f1..e067607da6 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -134,6 +134,18 @@ {requires, empty_db_check}, {enables, routing_ready}]}). +-rabbit_boot_step({mirror_queue_slave_sup, + [{description, "mirror queue slave sup"}, + {mfa, {rabbit_mirror_queue_slave_sup, start, []}}, + {requires, recovery}, + {enables, routing_ready}]}). + +-rabbit_boot_step({mirrored_queues, + [{description, "adding mirrors to queues"}, + {mfa, {rabbit_mirror_queue_misc, on_node_up, []}}, + {requires, mirror_queue_slave_sup}, + {enables, routing_ready}]}). + -rabbit_boot_step({routing_ready, [{description, "message delivery logic ready"}, {requires, core_initialized}]}). diff --git a/src/rabbit_mirror_queue_slave_sup.erl b/src/rabbit_mirror_queue_slave_sup.erl index 879a601754..fc04ec79ca 100644 --- a/src/rabbit_mirror_queue_slave_sup.erl +++ b/src/rabbit_mirror_queue_slave_sup.erl @@ -16,18 +16,6 @@ -module(rabbit_mirror_queue_slave_sup). --rabbit_boot_step({mirror_queue_slave_sup, - [{description, "mirror queue slave sup"}, - {mfa, {rabbit_mirror_queue_slave_sup, start, []}}, - {requires, recovery}, - {enables, routing_ready}]}). - --rabbit_boot_step({mirrored_queues, - [{description, "adding mirrors to queues"}, - {mfa, {rabbit_mirror_queue_misc, on_node_up, []}}, - {requires, mirror_queue_slave_sup}, - {enables, routing_ready}]}). - -behaviour(supervisor2). -export([start/0, start_link/0, start_child/2]). |