summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Majkowski <majek@lshift.net>2009-09-25 17:45:27 +0100
committerMarek Majkowski <majek@lshift.net>2009-09-25 17:45:27 +0100
commit9f47dc06410c0a6cf5f51c1e988458357d15149a (patch)
tree57c35c22fb1e280e604d9e5cd6a0b806aba3b12d
parenta7a34f7bc76bb4b4cb1e37adfeb4a41e31381294 (diff)
downloadrabbitmq-server-9f47dc06410c0a6cf5f51c1e988458357d15149a.tar.gz
renamed to vm_memory_monitor
-rw-r--r--src/rabbit.erl2
-rw-r--r--src/vm_memory_monitor.erl (renamed from src/rabbit_memguard.erl)4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 7df187cf..f19facfd 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -142,7 +142,7 @@ start(normal, []) ->
case MemoryWatermark of
{ok, false} -> ok;
{ok, off} -> ok;
- {ok, Float} -> start_child(rabbit_memguard, [Float])
+ {ok, Float} -> start_child(vm_memory_monitor, [Float])
end,
ok = rabbit_amqqueue:start(),
diff --git a/src/rabbit_memguard.erl b/src/vm_memory_monitor.erl
index 29e21bdc..2d10f069 100644
--- a/src/rabbit_memguard.erl
+++ b/src/vm_memory_monitor.erl
@@ -43,7 +43,7 @@
%% causes a side effect of setting the interval on Memsup.
%% This should rarely be an issue.
--module(rabbit_memguard).
+-module(vm_memory_monitor).
-behaviour(gen_server2).
@@ -57,7 +57,7 @@
get_vm_memory_high_watermark/0, set_vm_memory_high_watermark/1]).
--define(SERVER, rabbit_memguard).
+-define(SERVER, ?MODULE).
-define(DEFAULT_MEMORY_CHECK_INTERVAL, 1000).
%% For unknown OS, we assume that we have 512 MB of memory, which is pretty