Merge bug24162 into default

1 files changed, 7 insertions, 5 deletions

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.