summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2009-11-16 11:57:41 +0000
committerMatthew Sackman <matthew@lshift.net>2009-11-16 11:57:41 +0000
commit7ae9d36e313e6b71b4a24bca67a47bbebd6ed288 (patch)
tree3f7da44966b7a16f138c3a910c8c920b02653e00 /src
parent0e5c73726cc696a5c30a4d8f7af887ab9b3d9121 (diff)
downloadrabbitmq-server-git-7ae9d36e313e6b71b4a24bca67a47bbebd6ed288.tar.gz
all done
Diffstat (limited to 'src')
-rw-r--r--src/rabbit.erl18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 29407e4e78..c6dde385ce 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -141,16 +141,16 @@ start(normal, []) ->
check_empty_content_body_frame_size(),
ok = rabbit_alarm:start(),
- MemoryWatermark =
- application:get_env(os_mon, vm_memory_high_watermark),
- ok = case MemoryWatermark of
- {ok, Float} when Float == 0 -> ok;
- {ok, Float} -> start_child(vm_memory_monitor, [Float]);
- undefined ->
- throw({undefined, os_mon,
- vm_memory_high_watermark, settings})
+
+ {ok, MemoryWatermark} =
+ application:get_env(vm_memory_high_watermark),
+ ok = case MemoryWatermark == 0 of
+ true ->
+ ok;
+ false ->
+ start_child(vm_memory_monitor, [MemoryWatermark])
end,
-
+
ok = rabbit_amqqueue:start(),
ok = start_child(rabbit_router),