diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-08-03 00:06:00 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-08-03 00:06:00 +0100 |
| commit | 6674039eea2371cac28972bea9f920e1aa1580b3 (patch) | |
| tree | be92c98a124eec80ac0f0871601332c0c492f1b6 | |
| parent | c49e614d88b502dcc1d413314f9fbb1f1850dbf1 (diff) | |
| download | rabbitmq-server-6674039eea2371cac28972bea9f920e1aa1580b3.tar.gz | |
cosmetic
| -rw-r--r-- | src/vm_memory_monitor.erl | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl index 722d66ba..7c191684 100644 --- a/src/vm_memory_monitor.erl +++ b/src/vm_memory_monitor.erl @@ -77,11 +77,9 @@ %% Public API %%---------------------------------------------------------------------------- -get_total_memory() -> - get_total_memory(os:type()). +get_total_memory() -> get_total_memory(os:type()). -get_vm_limit() -> - get_vm_limit(os:type()). +get_vm_limit() -> get_vm_limit(os:type()). get_check_interval() -> gen_server:call(?MODULE, get_check_interval, infinity). @@ -189,21 +187,18 @@ internal_update(State = #state { memory_limit = MemLimit, MemUsed = erlang:memory(total), NewAlarmed = MemUsed > MemLimit, case {Alarmed, NewAlarmed} of - {false, true} -> - emit_update_info(set, MemUsed, MemLimit), - AlarmSet({{resource_limit, memory, node()}, []}); - {true, false} -> - emit_update_info(clear, MemUsed, MemLimit), - AlarmClear({resource_limit, memory, node()}); - _ -> - ok + {false, true} -> emit_update_info(set, MemUsed, MemLimit), + AlarmSet({{resource_limit, memory, node()}, []}); + {true, false} -> emit_update_info(clear, MemUsed, MemLimit), + AlarmClear({resource_limit, memory, node()}); + _ -> ok end, State #state {alarmed = NewAlarmed}. -emit_update_info(State, MemUsed, MemLimit) -> +emit_update_info(AlarmState, MemUsed, MemLimit) -> error_logger:info_msg( "vm_memory_high_watermark ~p. Memory used:~p allowed:~p~n", - [State, MemUsed, MemLimit]). + [AlarmState, MemUsed, MemLimit]). start_timer(Timeout) -> {ok, TRef} = timer:send_interval(Timeout, update), |