summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-11-06 13:04:31 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2012-11-06 13:04:31 +0000
commit9053f5396f955d4e63792475a648292be51de4bc (patch)
tree4c6a96acc80c046f52d95eef7efc1873df93f477 /src
parent75bd209f86712c07178cc737af6d86c9a68b73db (diff)
downloadrabbitmq-server-git-9053f5396f955d4e63792475a648292be51de4bc.tar.gz
send out the alarm event before gc
so subscribers can react to it quickly
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_alarm.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_alarm.erl b/src/rabbit_alarm.erl
index f350f2b28a..9d3798d8e1 100644
--- a/src/rabbit_alarm.erl
+++ b/src/rabbit_alarm.erl
@@ -56,7 +56,7 @@ start() ->
{ok, MemoryWatermark} = application:get_env(vm_memory_high_watermark),
rabbit_sup:start_restartable_child(
vm_memory_monitor, [MemoryWatermark,
- fun (Alarm) -> gc_all(), set_alarm(Alarm) end,
+ fun (Alarm) -> ok = set_alarm(Alarm), gc(), ok end,
fun clear_alarm/1]),
{ok, DiskLimit} = application:get_env(disk_free_limit),
rabbit_sup:start_restartable_child(rabbit_disk_monitor, [DiskLimit]),
@@ -227,4 +227,4 @@ handle_clear_alarm(Alarm, State) ->
rabbit_log:warning("alarm '~p' cleared~n", [Alarm]),
{ok, State}.
-gc_all() -> [erlang:garbage_collect(P) || P <- processes()].
+gc() -> [erlang:garbage_collect(P) || P <- processes()].