diff options
author | Matthew Sackman <matthew@lshift.net> | 2009-10-28 17:12:44 +0000 |
---|---|---|
committer | Matthew Sackman <matthew@lshift.net> | 2009-10-28 17:12:44 +0000 |
commit | 6b0d8823d3d265f2b9a450bff68962408d68b95c (patch) | |
tree | 80a6ac46a0be7ac2242fefa0e6e6f71423731825 | |
parent | 93f54b24a54f0bb35e21253bdefc5797fc11adf4 (diff) | |
download | rabbitmq-server-6b0d8823d3d265f2b9a450bff68962408d68b95c.tar.gz |
More cosmetic
-rw-r--r-- | src/rabbit.erl | 14 | ||||
-rw-r--r-- | src/rabbit_alarm.erl | 11 | ||||
-rw-r--r-- | src/vm_memory_monitor.erl | 2 |
3 files changed, 15 insertions, 12 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index be74283f..eee7d229 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -143,12 +143,14 @@ start(normal, []) -> ok = rabbit_alarm:start(), MemoryWatermark = application:get_env(os_mon, system_memory_high_watermark), - case MemoryWatermark of - {ok, false} -> ok; - {ok, off} -> ok; - {ok, Float} -> start_child(vm_memory_monitor, [Float]); - undefined -> throw({undefined, os_mon, system_memory_high_watermark, settings}) - end, + ok = case MemoryWatermark of + {ok, false} -> ok; + {ok, Float} when Float == 0 -> ok; + {ok, Float} -> start_child(vm_memory_monitor, [Float]); + undefined -> + throw({undefined, os_mon, + system_memory_high_watermark, settings}) + end, ok = rabbit_amqqueue:start(), diff --git a/src/rabbit_alarm.erl b/src/rabbit_alarm.erl index 5abd10bd..9a639ed4 100644 --- a/src/rabbit_alarm.erl +++ b/src/rabbit_alarm.erl @@ -69,14 +69,13 @@ register(Pid, HighMemMFA) -> init([]) -> {ok, #alarms{alertees = dict:new()}}. -handle_call({register, Pid, HighMemMFA}, +handle_call({register, Pid, {M, F, A} = HighMemMFA}, State = #alarms{alertees = Alertess}) -> _MRef = erlang:monitor(process, Pid), - case State#alarms.vm_memory_high_watermark of - true -> {M, F, A} = HighMemMFA, - ok = erlang:apply(M, F, A ++ [Pid, true]); - false -> ok - end, + ok = case State#alarms.vm_memory_high_watermark of + true -> apply(M, F, A ++ [Pid, true]); + false -> ok + end, NewAlertees = dict:store(Pid, HighMemMFA, Alertess), {ok, ok, State#alarms{alertees = NewAlertees}}; diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl index 45e9ea32..8bc6ae42 100644 --- a/src/vm_memory_monitor.erl +++ b/src/vm_memory_monitor.erl @@ -37,6 +37,8 @@ %% %% This module tries to warn Rabbit before such situations occur, so %% that it has a higher chance to avoid running out of memory. +%% +%% This code depends on Erlang os_mon application. -module(vm_memory_monitor). |