summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-06-18 13:33:43 +0100
committerSimon MacMullen <simon@rabbitmq.com>2013-06-18 13:33:43 +0100
commit8a42493141070e7dd86430f371064dda900dc973 (patch)
treecc53ef1aaeb9da4b51ece005a0f27b5517b81639 /src
parent413dd11bda0b1c06f3577f555094859777fe016e (diff)
downloadrabbitmq-server-git-8a42493141070e7dd86430f371064dda900dc973.tar.gz
Matthias convinced me to go with ratio-of-a-ratio.
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_memory_monitor.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_memory_monitor.erl b/src/rabbit_memory_monitor.erl
index a2df255cae..d47b6e30f3 100644
--- a/src/rabbit_memory_monitor.erl
+++ b/src/rabbit_memory_monitor.erl
@@ -197,8 +197,8 @@ internal_update(State = #state { queue_durations = Durations,
queue_duration_sum = Sum,
queue_duration_count = Count }) ->
{ok, LimitThreshold} =
- application:get_env(rabbit, vm_memory_paging_watermark),
- MemoryRatio = erlang:memory(total) / vm_memory_monitor:get_total_memory(),
+ application:get_env(rabbit, vm_memory_high_watermark_paging_ratio),
+ MemoryRatio = erlang:memory(total) / vm_memory_monitor:get_memory_limit(),
DesiredDurationAvg1 =
if MemoryRatio =:= infinity ->
0.0;