qa fixes, some refactoring

1 files changed, 4 insertions, 6 deletions

diff --git a/src/rabbit.erl b/src/rabbit.erl
index 875021aa6c..7df187cfb5 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -137,7 +137,9 @@ start(normal, []) ->
                     check_empty_content_body_frame_size(),
 
                 ok = rabbit_alarm:start(),
-                case application:get_env(memory_high_watermark) of
+                MemoryWatermark = 
+                    application:get_env(os_mon, system_memory_high_watermark),
+                case MemoryWatermark of
                     {ok, false} -> ok;
                     {ok, off} -> ok;
                     {ok, Float} -> start_child(rabbit_memguard, [Float])
@@ -251,10 +253,7 @@ print_banner() ->
     io:nl().
 
 start_child(Mod) ->
-    {ok,_} = supervisor:start_child(rabbit_sup,
-                                    {Mod, {Mod, start_link, []},
-                                     transient, 100, worker, [Mod]}),
-    ok.
+    start_child(Mod, []).
 
 start_child(Mod, Args) ->
     {ok,_} = supervisor:start_child(rabbit_sup,
@@ -262,7 +261,6 @@ start_child(Mod, Args) ->
                                      transient, 100, worker, [Mod]}),
     ok.
 
-
 ensure_working_log_handlers() ->
     Handlers = gen_event:which_handlers(error_logger),
     ok = ensure_working_log_handler(error_logger_file_h,