summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-11-07 10:24:59 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2012-11-07 10:24:59 +0000
commit1a4262f574568e17a8702ff6772a7ca8eed8c2d6 (patch)
tree4c33159e3338f88781b8495b878bd014f9898b65
parentfd9e7679a8df897c06dfb9e26ad6ae79d7b0b170 (diff)
downloadrabbitmq-server-1a4262f574568e17a8702ff6772a7ca8eed8c2d6.tar.gz
inline
-rw-r--r--src/rabbit_alarm.erl8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/rabbit_alarm.erl b/src/rabbit_alarm.erl
index 2f182423..675d3697 100644
--- a/src/rabbit_alarm.erl
+++ b/src/rabbit_alarm.erl
@@ -56,7 +56,11 @@ start() ->
{ok, MemoryWatermark} = application:get_env(vm_memory_high_watermark),
rabbit_sup:start_restartable_child(
vm_memory_monitor, [MemoryWatermark,
- fun (Alarm) -> R = set_alarm(Alarm), gc(), R end,
+ fun (Alarm) ->
+ R = set_alarm(Alarm),
+ [garbage_collect(P) || P <- processes()],
+ R
+ end,
fun clear_alarm/1]),
{ok, DiskLimit} = application:get_env(disk_free_limit),
rabbit_sup:start_restartable_child(rabbit_disk_monitor, [DiskLimit]),
@@ -226,5 +230,3 @@ handle_clear_alarm(file_descriptor_limit, State) ->
handle_clear_alarm(Alarm, State) ->
rabbit_log:warning("alarm '~p' cleared~n", [Alarm]),
{ok, State}.
-
-gc() -> [erlang:garbage_collect(P) || P <- processes()].