summaryrefslogtreecommitdiff
path: root/src/vm_memory_monitor.erl
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2011-02-24 18:15:34 +0000
committerMatthew Sackman <matthew@rabbitmq.com>2011-02-24 18:15:34 +0000
commit6fd77744201852a1fb961809f693d8b27acf7346 (patch)
treeec435583bd44f02bdef618a522ab94ea27a7cab6 /src/vm_memory_monitor.erl
parent5b5c93a5612203ce2db313fc451f223fc2e83c61 (diff)
downloadrabbitmq-server-6fd77744201852a1fb961809f693d8b27acf7346.tar.gz
Make memory alarms work correctly over clusters
Diffstat (limited to 'src/vm_memory_monitor.erl')
-rw-r--r--src/vm_memory_monitor.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl
index 44e1e4b5..dcc6aff5 100644
--- a/src/vm_memory_monitor.erl
+++ b/src/vm_memory_monitor.erl
@@ -175,10 +175,10 @@ internal_update(State = #state { memory_limit = MemLimit,
case {Alarmed, NewAlarmed} of
{false, true} ->
emit_update_info(set, MemUsed, MemLimit),
- alarm_handler:set_alarm({vm_memory_high_watermark, []});
+ alarm_handler:set_alarm({{vm_memory_high_watermark, node()}, []});
{true, false} ->
emit_update_info(clear, MemUsed, MemLimit),
- alarm_handler:clear_alarm(vm_memory_high_watermark);
+ alarm_handler:clear_alarm({vm_memory_high_watermark, node()});
_ ->
ok
end,