diff options
author | Simon MacMullen <simon@rabbitmq.com> | 2014-10-03 15:21:06 +0100 |
---|---|---|
committer | Simon MacMullen <simon@rabbitmq.com> | 2014-10-03 15:21:06 +0100 |
commit | 6f385f14545c5e5c3eace700369298c4f3b78f09 (patch) | |
tree | 059af7e9ad8d02b0aa24d8e2cfb3b4ff4b6c9d68 /src/rabbit.erl | |
parent | c6bc6a79fb66a59414e494b5f343f437ea418e51 (diff) | |
parent | 9ce3e5c8b92b2cd4db5db3b1bd008918af6ea442 (diff) | |
download | rabbitmq-server-6f385f14545c5e5c3eace700369298c4f3b78f09.tar.gz |
Merge bug 26213
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r-- | src/rabbit.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 5fd67cab..1dd7c1e9 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -115,7 +115,7 @@ [{description, "node monitor"}, {mfa, {rabbit_sup, start_restartable_child, [rabbit_node_monitor]}}, - {requires, rabbit_alarm}, + {requires, [rabbit_alarm, guid_generator]}, {enables, core_initialized}]}). -rabbit_boot_step({core_initialized, @@ -547,11 +547,15 @@ vertices({AppName, _Module, Steps}) -> [{StepName, {AppName, StepName, Atts}} || {StepName, Atts} <- Steps]. edges({_AppName, _Module, Steps}) -> + EnsureList = fun (L) when is_list(L) -> L; + (T) -> [T] + end, [case Key of requires -> {StepName, OtherStep}; enables -> {OtherStep, StepName} end || {StepName, Atts} <- Steps, - {Key, OtherStep} <- Atts, + {Key, OtherStepOrSteps} <- Atts, + OtherStep <- EnsureList(OtherStepOrSteps), Key =:= requires orelse Key =:= enables]. sort_boot_steps(UnsortedSteps) -> |