More cosmetic

3 files changed, 15 insertions, 12 deletions

diff --git a/src/rabbit.erl b/src/rabbit.erl
index be74283f14..eee7d229c4 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 5abd10bd1a..9a639ed40f 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 45e9ea3228..8bc6ae4291 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).