diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-08-05 10:33:32 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-08-05 10:33:32 +0100 |
| commit | f9bbe5dd9eba7c07a72615685bfffb30c4b7660f (patch) | |
| tree | 6759791b764c1299ff9dcf89025756e6254e5592 /src | |
| parent | 17890fced8fab250c79fd49fe15522dd089a2fc5 (diff) | |
| parent | 9b791b038c2a7c4b0e6b876414d677215be4eb03 (diff) | |
| download | rabbitmq-server-git-f9bbe5dd9eba7c07a72615685bfffb30c4b7660f.tar.gz | |
Merge bug23077 into default.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_event.erl | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 1fab7e4d82..41c628a071 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -90,9 +90,9 @@ {enables, kernel_ready}]}). -rabbit_boot_step({rabbit_event, - [{description, "statistics event handler"}, + [{description, "statistics event manager"}, {mfa, {rabbit_sup, start_restartable_child, - [gen_event, [{local, rabbit_event}]]}}, + [rabbit_event]}}, {requires, external_infrastructure}, {enables, kernel_ready}]}). diff --git a/src/rabbit_event.erl b/src/rabbit_event.erl index 0639b396fa..113ffcb4bc 100644 --- a/src/rabbit_event.erl +++ b/src/rabbit_event.erl @@ -33,6 +33,7 @@ -include("rabbit.hrl"). +-export([start_link/0]). -export([init_stats_timer/0, ensure_stats_timer/3, stop_stats_timer/2]). -export([ensure_stats_timer_after/2, reset_stats_timer_after/1]). -export([stats_level/1]). @@ -68,6 +69,7 @@ -type(timer_fun() :: fun (() -> 'ok')). +-spec(start_link/0 :: () -> rabbit_types:ok_or_error2(pid(), any())). -spec(init_stats_timer/0 :: () -> state()). -spec(ensure_stats_timer/3 :: (state(), timer_fun(), timer_fun()) -> state()). -spec(stop_stats_timer/2 :: (state(), timer_fun()) -> state()). @@ -80,6 +82,9 @@ %%---------------------------------------------------------------------------- +start_link() -> + gen_event:start_link({local, ?MODULE}). + init_stats_timer() -> {ok, StatsLevel} = application:get_env(rabbit, collect_statistics), #state{level = StatsLevel, timer = undefined}. |