summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index b55c129a91..24883dc6d4 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -40,6 +40,13 @@
{requires, pre_boot},
{enables, external_infrastructure}]}).
+%% rabbit_alarm currently starts memory and disk space monitors
+-rabbit_boot_step({rabbit_alarm,
+ [{description, "alarm handler"},
+ {mfa, {rabbit_alarm, start, []}},
+ {requires, pre_boot},
+ {enables, external_infrastructure}]}).
+
-rabbit_boot_step({database,
[{mfa, {rabbit_mnesia, init, []}},
{requires, file_handle_cache},
@@ -54,7 +61,8 @@
-rabbit_boot_step({file_handle_cache,
[{description, "file handle cache server"},
{mfa, {rabbit, start_fhc, []}},
- {requires, pre_boot},
+ %% FHC needs memory monitor to be running
+ {requires, rabbit_alarm},
{enables, worker_pool}]}).
-rabbit_boot_step({worker_pool,
@@ -85,12 +93,6 @@
[{description, "kernel ready"},
{requires, external_infrastructure}]}).
--rabbit_boot_step({rabbit_alarm,
- [{description, "alarm handler"},
- {mfa, {rabbit_alarm, start, []}},
- {requires, kernel_ready},
- {enables, core_initialized}]}).
-
-rabbit_boot_step({rabbit_memory_monitor,
[{description, "memory monitor"},
{mfa, {rabbit_sup, start_restartable_child,