diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2017-04-12 13:28:25 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2017-04-12 13:28:25 +0300 |
| commit | c340c0d92aeba9f4b89f0e0e81e774393d3677c0 (patch) | |
| tree | f2ae7eed2e53950f80fe23b4a4ab2373226fdde8 | |
| parent | 730fb6d6a5f853f01f56c7636a682e862d54dbff (diff) | |
| download | rabbitmq-server-git-c340c0d92aeba9f4b89f0e0e81e774393d3677c0.tar.gz | |
Naming
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/rabbit_disk_monitor.erl | 4 | ||||
| -rw-r--r-- | test/unit_inbroker_non_parallel_SUITE.erl | 8 |
3 files changed, 8 insertions, 8 deletions
@@ -108,8 +108,8 @@ define PROJECT_ENV {lazy_queue_explicit_gc_run_operation_threshold, 1000}, {background_gc_enabled, false}, {background_gc_target_interval, 60000}, - {disk_monitor_enable_retries, 10}, - {disk_monitor_enable_interval, 120000} + {disk_monitor_failure_retries, 10}, + {disk_monitor_failure_retry_interval, 120000} ] endef diff --git a/src/rabbit_disk_monitor.erl b/src/rabbit_disk_monitor.erl index a5f7851164..629228a1be 100644 --- a/src/rabbit_disk_monitor.erl +++ b/src/rabbit_disk_monitor.erl @@ -119,8 +119,8 @@ start_link(Args) -> init([Limit]) -> Dir = dir(), - {ok, Retries} = application:get_env(rabbit, disk_monitor_enable_retries), - {ok, Interval} = application:get_env(rabbit, disk_monitor_enable_interval), + {ok, Retries} = application:get_env(rabbit, disk_monitor_failure_retries), + {ok, Interval} = application:get_env(rabbit, disk_monitor_failure_retry_interval), State = #state{dir = Dir, min_interval = ?DEFAULT_MIN_DISK_CHECK_INTERVAL, max_interval = ?DEFAULT_MAX_DISK_CHECK_INTERVAL, diff --git a/test/unit_inbroker_non_parallel_SUITE.erl b/test/unit_inbroker_non_parallel_SUITE.erl index 68b7a15a8a..cc14001df6 100644 --- a/test/unit_inbroker_non_parallel_SUITE.erl +++ b/test/unit_inbroker_non_parallel_SUITE.erl @@ -761,8 +761,8 @@ disk_monitor_enable1(_Config) -> disk_monitor_enable1() -> ok = meck:new(rabbit_misc, [passthrough]), ok = meck:expect(rabbit_misc, os_cmd, fun(_) -> "\n" end), - application:set_env(rabbit, disk_monitor_enable_retries, 20000), - application:set_env(rabbit, disk_monitor_enable_interval, 100), + application:set_env(rabbit, disk_monitor_failure_retries, 20000), + application:set_env(rabbit, disk_monitor_failure_retry_interval, 100), ok = rabbit_sup:stop_child(rabbit_disk_monitor_sup), ok = rabbit_sup:start_delayed_restartable_child(rabbit_disk_monitor, [1000]), undefined = rabbit_disk_monitor:get_disk_free(), @@ -772,8 +772,8 @@ disk_monitor_enable1() -> Bytes = 740758908 * 1024, Bytes = rabbit_disk_monitor:get_disk_free(), meck:unload(rabbit_misc), - application:set_env(rabbit, disk_monitor_enable_retries, 10), - application:set_env(rabbit, disk_monitor_enable_interval, 120000), + application:set_env(rabbit, disk_monitor_failure_retries, 10), + application:set_env(rabbit, disk_monitor_failure_retry_interval, 120000), passed. %% --------------------------------------------------------------------------- |