minor os_mon fixes

2 files changed, 3 insertions, 3 deletions

diff --git a/src/rabbit.erl b/src/rabbit.erl
index f19facfdaf..d7a9497c66 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -142,7 +142,8 @@ start(normal, []) ->
                 case MemoryWatermark of
                     {ok, false} -> ok;
                     {ok, off} -> ok;
-                    {ok, Float} -> start_child(vm_memory_monitor, [Float])
+                    {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/vm_memory_monitor.erl b/src/vm_memory_monitor.erl
index 2d10f0697e..cdd53236f5 100644
--- a/src/vm_memory_monitor.erl
+++ b/src/vm_memory_monitor.erl
@@ -124,8 +124,6 @@ get_total_memory({unix, linux}) ->
 get_total_memory(_OsType) ->
     unknown.
 
--define(BUFFER_SIZE, 1024).
-    
 %% A line looks like "Foo bar: 123456."
 parse_line_mach(Line) ->
     [Name, RHS | _Rest] = string:tokens(Line, ":"),
@@ -152,6 +150,7 @@ read_proc_file(File) ->
     file:close(IoDevice),
     lists:flatten(lists:reverse(Res)).
 
+-define(BUFFER_SIZE, 1024).
 read_proc_file(IoDevice, Acc) ->
     case file:read(IoDevice, ?BUFFER_SIZE) of
         {ok, Res} -> read_proc_file(IoDevice, [Res | Acc]);