diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-05-20 09:44:01 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-05-20 09:44:01 +0200 |
| commit | ec12f616ef026f881495f24ffc10d77ada403a3a (patch) | |
| tree | c8fa618b26ce7ce89944246b8bb52c42207ec54c | |
| parent | a003065d6c3c73490e1f85b906936a906ebcd673 (diff) | |
| parent | e100e9a12aef79f9b76dbd9771b2acda2f4ed916 (diff) | |
| download | rabbitmq-server-git-ec12f616ef026f881495f24ffc10d77ada403a3a.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | src/rabbit.erl | 16 |
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, |