diff options
| author | Alvaro Videla <videlalvaro@gmail.com> | 2015-10-14 07:45:50 +0200 |
|---|---|---|
| committer | Alvaro Videla <videlalvaro@gmail.com> | 2015-10-14 07:45:50 +0200 |
| commit | 6c3de1303e4a1175fa3e222ff7a47a83cb258bbc (patch) | |
| tree | 55dad87b2ed5c91cf28980070b97251b397d1b1c /src | |
| parent | ee19ec06d56bc73a8ba542f9202ba7a7f5bccc56 (diff) | |
| parent | 63eccd863a493795a92941af3be41af364e1d637 (diff) | |
| download | rabbitmq-server-git-6c3de1303e4a1175fa3e222ff7a47a83cb258bbc.tar.gz | |
Merge branch 'master' into rabbitmq-server-351
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_memory_monitor.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_memory_monitor.erl b/src/rabbit_memory_monitor.erl index 7aa29fc423..24b3ae9af4 100644 --- a/src/rabbit_memory_monitor.erl +++ b/src/rabbit_memory_monitor.erl @@ -41,7 +41,6 @@ }). -define(SERVER, ?MODULE). --define(DEFAULT_UPDATE_INTERVAL, 2500). -define(TABLE_NAME, ?MODULE). %% If all queues are pushed to disk (duration 0), then the sum of @@ -110,7 +109,8 @@ memory_use(ratio) -> %%---------------------------------------------------------------------------- init([]) -> - {ok, TRef} = timer:send_interval(?DEFAULT_UPDATE_INTERVAL, update), + {ok, Interval} = application:get_env(rabbit, memory_monitor_interval), + {ok, TRef} = timer:send_interval(Interval, update), Ets = ets:new(?TABLE_NAME, [set, private, {keypos, #process.pid}]), Alarms = rabbit_alarm:register(self(), {?MODULE, conserve_resources, []}), |