diff options
| author | Gustav Simonsson <[email protected]> | 2012-05-31 11:29:15 +0200 |
|---|---|---|
| committer | Gustav Simonsson <[email protected]> | 2012-05-31 11:29:15 +0200 |
| commit | 518fa9aa38fd462c5b30474fa5f346bd4c9e99ff (patch) | |
| tree | 8500a8d8fe2563ad2bfb828796b7d9109130cb9a | |
| parent | ac20ee2a68c632ab44f8c6ba151fa37600221288 (diff) | |
| parent | 570f71bd3e5c6ace878a0ec0ed64e09864410b32 (diff) | |
| download | otp-518fa9aa38fd462c5b30474fa5f346bd4c9e99ff.tar.gz otp-518fa9aa38fd462c5b30474fa5f346bd4c9e99ff.tar.bz2 otp-518fa9aa38fd462c5b30474fa5f346bd4c9e99ff.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/os_mon/src/disksup.erl | 10 | ||||
| -rw-r--r-- | lib/os_mon/src/memsup.erl | 2 |
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. |