summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-09-29 17:51:53 +0100
committerSimon MacMullen <simon@rabbitmq.com>2014-09-29 17:51:53 +0100
commitfb200997e97af5d4f15166a53beca72101602a8d (patch)
treef948eed71537bc010f4d1ef0c8011e5a92526e9f /src/rabbit.erl
parent0227c663a6177e7872a68b089b4f15a7cdd491ad (diff)
downloadrabbitmq-server-fb200997e97af5d4f15166a53beca72101602a8d.tar.gz
Partial partition detection and handling (where by "handling" we mean "promotion to full partition"). This necessitates that we hold GUIDs for each node (so that we can detect if a node has restarted behind our back).
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index b8b21c10..cf45c562 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -102,7 +102,8 @@
[{description, "guid generator"},
{mfa, {rabbit_sup, start_restartable_child,
[rabbit_guid]}},
- {requires, kernel_ready},
+ {requires, rabbit_alarm}, %% transitive to node monitor
+ %% TODO ugly
{enables, core_initialized}]}).
-rabbit_boot_step({delegate_sup,
@@ -115,7 +116,7 @@
[{description, "node monitor"},
{mfa, {rabbit_sup, start_restartable_child,
[rabbit_node_monitor]}},
- {requires, rabbit_alarm},
+ {requires, guid_generator},
{enables, core_initialized}]}).
-rabbit_boot_step({core_initialized,