summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2010-01-27 16:34:39 +0000
committerMatthias Radestock <matthias@lshift.net>2010-01-27 16:34:39 +0000
commit9181d3406c85be7dd8c79448f8d9fb701874a60c (patch)
tree062533840b58290c1ad6cf8f5b6c77dbf6be123e
parent4691d6a87e77737f9b02b4375be88f290cc07d5a (diff)
downloadrabbitmq-server-git-9181d3406c85be7dd8c79448f8d9fb701874a60c.tar.gz
infinite timeout in all vm_memory_monitor gen_server:calls
since we have come to the conclusion that this is generally preferable to things failing after some some semi-arbitrary interval.
-rw-r--r--src/vm_memory_monitor.erl9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl
index 8be28f523d..a8a1af0b65 100644
--- a/src/vm_memory_monitor.erl
+++ b/src/vm_memory_monitor.erl
@@ -96,16 +96,17 @@ get_total_memory() ->
get_total_memory(os:type()).
get_check_interval() ->
- gen_server:call(?MODULE, get_check_interval).
+ gen_server:call(?MODULE, get_check_interval, infinity).
set_check_interval(Fraction) ->
- gen_server:call(?MODULE, {set_check_interval, Fraction}).
+ gen_server:call(?MODULE, {set_check_interval, Fraction}, infinity).
get_vm_memory_high_watermark() ->
- gen_server:call(?MODULE, get_vm_memory_high_watermark).
+ gen_server:call(?MODULE, get_vm_memory_high_watermark, infinity).
set_vm_memory_high_watermark(Fraction) ->
- gen_server:call(?MODULE, {set_vm_memory_high_watermark, Fraction}).
+ gen_server:call(?MODULE, {set_vm_memory_high_watermark, Fraction},
+ infinity).
%%----------------------------------------------------------------------------
%% gen_server callbacks