summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-01-05 12:43:15 +0000
committerSimon MacMullen <simon@rabbitmq.com>2012-01-05 12:43:15 +0000
commit654c5c5edbb86c958588a8308024f52f129e5bea (patch)
treea5b77eef7b1c435a055b461c9e4cb8b07cdf7b99
parent5c5ce28e1616c210ae9fbad9eed324c623de380c (diff)
downloadrabbitmq-server-bug23432.tar.gz
Avoid a circular dependency. The new load_definitions depends on recovery (since it may create a queue and recovery starts the sup). But recovery depends on empty_db_check. But load_definitions *enables* empty_db_check (since we want to avoid creating default_foo if we just loaded a bunch of definitions).bug23432
But there's a simple fix: recovery doesn't actually need to depend on empty_db_check.
-rw-r--r--src/rabbit.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 0a2681a2..f61f45b8 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -132,7 +132,7 @@
-rabbit_boot_step({recovery,
[{description, "exchange, queue and binding recovery"},
{mfa, {rabbit, recover, []}},
- {requires, empty_db_check},
+ {requires, core_initialized},
{enables, routing_ready}]}).
-rabbit_boot_step({mirror_queue_slave_sup,