summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2011-07-26 17:24:59 +0100
committerMatthew Sackman <matthew@rabbitmq.com>2011-07-26 17:24:59 +0100
commit9433b14ae3f0e864895b0b02837b7598cadfe32c (patch)
treeb21abf5d2c323305bb82e11c238157669b9590ac
parent076f9c4723b987e89520754aa5bf7859a3192b04 (diff)
downloadrabbitmq-server-9433b14ae3f0e864895b0b02837b7598cadfe32c.tar.gz
Move ha boot steps to somewhere more appropriate
-rw-r--r--src/rabbit.erl12
-rw-r--r--src/rabbit_mirror_queue_slave_sup.erl12
2 files changed, 12 insertions, 12 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 6ef816c0..e067607d 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 879a6017..fc04ec79 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]).