summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl14
1 files changed, 8 insertions, 6 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(),