aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorGustav Simonsson <[email protected]>2012-05-31 11:28:41 +0200
committerGustav Simonsson <[email protected]>2012-05-31 11:28:41 +0200
commit570f71bd3e5c6ace878a0ec0ed64e09864410b32 (patch)
treeb1690b2013550247f72abab5f883500b9f01c882 /lib
parent4535d409f75eeeb0e36b53f3a59d4f6e6f9529d1 (diff)
parent7a92687ec2b44353fef273a9e1e731f64c4a6d2e (diff)
downloadotp-570f71bd3e5c6ace878a0ec0ed64e09864410b32.tar.gz
otp-570f71bd3e5c6ace878a0ec0ed64e09864410b32.tar.bz2
otp-570f71bd3e5c6ace878a0ec0ed64e09864410b32.zip
Merge branch 'gustav/os_mon/disksup_call_timeout/OTP-10100' into maint
* gustav/os_mon/disksup_call_timeout/OTP-10100: Add infinity timeout to os_mon calls
Diffstat (limited to 'lib')
-rw-r--r--lib/os_mon/src/disksup.erl10
-rw-r--r--lib/os_mon/src/memsup.erl2
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/os_mon/src/disksup.erl b/lib/os_mon/src/disksup.erl
index 308cd1b7fa..c7abb7a386 100644
--- a/lib/os_mon/src/disksup.erl
+++ b/lib/os_mon/src/disksup.erl
@@ -43,24 +43,24 @@ start_link() ->
gen_server:start_link({local, disksup}, disksup, [], []).
get_disk_data() ->
- os_mon:call(disksup, get_disk_data).
+ os_mon:call(disksup, get_disk_data, infinity).
get_check_interval() ->
- os_mon:call(disksup, get_check_interval).
+ os_mon:call(disksup, get_check_interval, infinity).
set_check_interval(Minutes) ->
case param_type(disk_space_check_interval, Minutes) of
true ->
- os_mon:call(disksup, {set_check_interval, Minutes});
+ os_mon:call(disksup, {set_check_interval, Minutes}, infinity);
false ->
erlang:error(badarg)
end.
get_almost_full_threshold() ->
- os_mon:call(disksup, get_almost_full_threshold).
+ os_mon:call(disksup, get_almost_full_threshold, infinity).
set_almost_full_threshold(Float) ->
case param_type(disk_almost_full_threshold, Float) of
true ->
- os_mon:call(disksup, {set_almost_full_threshold, Float});
+ os_mon:call(disksup, {set_almost_full_threshold, Float}, infinity);
false ->
erlang:error(badarg)
end.
diff --git a/lib/os_mon/src/memsup.erl b/lib/os_mon/src/memsup.erl
index 5ef240f128..54771b4703 100644
--- a/lib/os_mon/src/memsup.erl
+++ b/lib/os_mon/src/memsup.erl
@@ -112,7 +112,7 @@ get_helper_timeout() ->
set_helper_timeout(Seconds) ->
case param_type(memsup_helper_timeout, Seconds) of
true ->
- os_mon:call(memsup, {set_helper_timeout, Seconds});
+ os_mon:call(memsup, {set_helper_timeout, Seconds}, infinity);
false ->
erlang:error(badarg)
end.