diff options
| author | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-08-01 15:59:47 +0100 |
|---|---|---|
| committer | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-08-01 15:59:47 +0100 |
| commit | d39b2bb892ac9b4f92e27c9aa1ccb11276ec35fa (patch) | |
| tree | 79688178fb289e88a08dc948964e9d7dc23453a6 /src/rabbit.erl | |
| parent | 03084f29639c7889b6c4d03c4290a9e66f81eb29 (diff) | |
| parent | e62a381d53e320cb4778cfac94be18f38fb51c8f (diff) | |
| download | rabbitmq-server-git-d39b2bb892ac9b4f92e27c9aa1ccb11276ec35fa.tar.gz | |
merge default
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 23b422af33..f7953c55d1 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -20,7 +20,8 @@ -export([start/0, boot/0, stop/0, stop_and_halt/0, await_startup/0, status/0, is_running/0, - is_running/1, environment/0, rotate_logs/1, force_event_refresh/0]). + is_running/1, environment/0, rotate_logs/1, force_event_refresh/0, + start_fhc/0]). -export([start/2, stop/1]). @@ -53,8 +54,7 @@ -rabbit_boot_step({file_handle_cache, [{description, "file handle cache server"}, - {mfa, {rabbit_sup, start_restartable_child, - [file_handle_cache]}}, + {mfa, {rabbit, start_fhc, []}}, {requires, pre_boot}, {enables, worker_pool}]}). @@ -731,3 +731,10 @@ config_files() -> [File] <- Files]; error -> [] end. + +%% We don't want this in fhc since it references rabbit stuff. And we can't put +%% this in the bootstep directly. +start_fhc() -> + rabbit_sup:start_restartable_child( + file_handle_cache, + [fun rabbit_alarm:set_alarm/1, fun rabbit_alarm:clear_alarm/1]). |