diff options
| author | Rob Harrop <rob@rabbitmq.com> | 2011-06-13 12:46:16 +0100 |
|---|---|---|
| committer | Rob Harrop <rob@rabbitmq.com> | 2011-06-13 12:46:16 +0100 |
| commit | af72998b14f2852bdd098ee1252aa0af6df802df (patch) | |
| tree | 597377ad690e99682a445c884ddefdf6af31dc43 | |
| parent | 6e508e646db617d2a98fa650cb0fd1c4877f4f68 (diff) | |
| parent | 8e28d7ae243663d7af2bd41654987a9b421ff5b1 (diff) | |
| download | rabbitmq-server-git-af72998b14f2852bdd098ee1252aa0af6df802df.tar.gz | |
Merge bug24162 into default
| -rw-r--r-- | ebin/rabbit_app.in | 1 | ||||
| -rw-r--r-- | include/rabbit.hrl | 1 | ||||
| -rw-r--r-- | src/rabbit_event.erl | 12 |
3 files changed, 8 insertions, 6 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in index 7dabb8c346..0afd7da6a4 100644 --- a/ebin/rabbit_app.in +++ b/ebin/rabbit_app.in @@ -33,6 +33,7 @@ {cluster_nodes, []}, {server_properties, []}, {collect_statistics, none}, + {collect_statistics_interval, 5000}, {auth_mechanisms, ['PLAIN', 'AMQPLAIN']}, {auth_backends, [rabbit_auth_backend_internal]}, {delegate_count, 16}, diff --git a/include/rabbit.hrl b/include/rabbit.hrl index db4773b8ec..67e2dfe5fa 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -86,7 +86,6 @@ -define(HIBERNATE_AFTER_MIN, 1000). -define(DESIRED_HIBERNATE, 10000). --define(STATS_INTERVAL, 5000). -define(ROUTING_HEADERS, [<<"CC">>, <<"BCC">>]). -define(DELETED_HEADER, <<"BCC">>). diff --git a/src/rabbit_event.erl b/src/rabbit_event.erl index 9ed532db2a..468f92936f 100644 --- a/src/rabbit_event.erl +++ b/src/rabbit_event.erl @@ -26,7 +26,7 @@ %%---------------------------------------------------------------------------- --record(state, {level, timer}). +-record(state, {level, interval, timer}). %%---------------------------------------------------------------------------- @@ -49,6 +49,7 @@ -opaque(state() :: #state { level :: level(), + interval :: integer(), timer :: atom() }). @@ -95,13 +96,14 @@ start_link() -> init_stats_timer() -> {ok, StatsLevel} = application:get_env(rabbit, collect_statistics), - #state{level = StatsLevel, timer = undefined}. + {ok, Interval} = application:get_env(rabbit, collect_statistics_interval), + #state{level = StatsLevel, interval = Interval, timer = undefined}. ensure_stats_timer(State = #state{level = none}, _Fun) -> State; -ensure_stats_timer(State = #state{timer = undefined}, Fun) -> - {ok, TRef} = timer:apply_after(?STATS_INTERVAL, - erlang, apply, [Fun, []]), +ensure_stats_timer(State = #state{interval = Interval, + timer = undefined}, Fun) -> + {ok, TRef} = timer:apply_after(Interval, erlang, apply, [Fun, []]), State#state{timer = TRef}; ensure_stats_timer(State, _Fun) -> State. |