summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2009-10-28 17:21:38 +0000
committerMatthew Sackman <matthew@lshift.net>2009-10-28 17:21:38 +0000
commit12115e38cd1ee39e1636d424822099015f789dad (patch)
treed2675e4513ca1e19de3bb41aee37caf8037c90ec /src
parentea5bad14e67fd26e69d93db58ac9eb26439d85bb (diff)
downloadrabbitmq-server-git-12115e38cd1ee39e1636d424822099015f789dad.tar.gz
system_memory_high_watermark => vm_memory_high_watermark
Diffstat (limited to 'src')
-rw-r--r--src/rabbit.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index eee7d229c4..2e9e6e7db4 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -142,14 +142,14 @@ start(normal, []) ->
ok = rabbit_alarm:start(),
MemoryWatermark =
- application:get_env(os_mon, system_memory_high_watermark),
+ application:get_env(os_mon, vm_memory_high_watermark),
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})
+ vm_memory_high_watermark, settings})
end,
ok = rabbit_amqqueue:start(),