summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2010-04-26 17:43:34 +0100
committerMatthew Sackman <matthew@lshift.net>2010-04-26 17:43:34 +0100
commitb3bb364725f16585433cb9b5c8019a98a5a7a2b2 (patch)
tree658c8873c44323172df9c6742628ea59aaf570d7 /src/rabbit.erl
parent7e671d094da670ca0b519ee8936cce9da016b0c9 (diff)
parent9637b0056fb1112022bda43e5451bee9237d7f63 (diff)
downloadrabbitmq-server-git-b3bb364725f16585433cb9b5c8019a98a5a7a2b2.tar.gz
Merging default into bug19844
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index e7bff27082..26f244bc6d 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -91,6 +91,13 @@
{requires, kernel_ready},
{enables, core_initialized}]}).
+-rabbit_boot_step({guid_generator,
+ [{description, "guid generator"},
+ {mfa, {rabbit_sup, start_restartable_child,
+ [rabbit_guid]}},
+ {requires, kernel_ready},
+ {enables, core_initialized}]}).
+
-rabbit_boot_step({delegate_sup,
[{description, "cluster delegate"},
{mfa, {rabbit_sup, start_child,
@@ -128,13 +135,6 @@
[rabbit_persister]}},
{requires, queue_sup_queue_recovery}]}).
--rabbit_boot_step({guid_generator,
- [{description, "guid generator"},
- {mfa, {rabbit_sup, start_restartable_child,
- [rabbit_guid]}},
- {requires, persister},
- {enables, routing_ready}]}).
-
-rabbit_boot_step({routing_ready,
[{description, "message delivery logic ready"}]}).