diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2012-03-26 11:04:39 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2012-03-26 11:04:39 +0100 |
| commit | b5ecf2c371d3dd6c7308192d9bb353fbe37aed42 (patch) | |
| tree | ef5663cbcc1b5c63331bd3f09e8f2a759d564ccf /src | |
| parent | f2a36056915621667b0608ad7369a9518a02a7b8 (diff) | |
| download | rabbitmq-server-git-b5ecf2c371d3dd6c7308192d9bb353fbe37aed42.tar.gz | |
Rename disk_monitor
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_alarm.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_control.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_disk_monitor.erl (renamed from src/disk_monitor.erl) | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_alarm.erl b/src/rabbit_alarm.erl index c95966b50b..d59d37e1e6 100644 --- a/src/rabbit_alarm.erl +++ b/src/rabbit_alarm.erl @@ -47,11 +47,11 @@ start() -> rabbit_sup:start_restartable_child(vm_memory_monitor, [MemoryWatermark]), {ok, DiskLimit} = application:get_env(disk_free_limit), - rabbit_sup:start_restartable_child(disk_monitor, [DiskLimit]), - case disk_monitor:get_disk_free() of + rabbit_sup:start_restartable_child(rabbit_disk_monitor, [DiskLimit]), + case rabbit_disk_monitor:get_disk_free() of Number when is_integer(Number) -> ok; _ -> error_logger:warning_msg("Disabling disk free space monitoring~n"), - ok = rabbit_sup:stop_child(disk_monitor_sup) + ok = rabbit_sup:stop_child(rabbit_disk_monitor_sup) end, ok. diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index 580faaeabc..7e341cf24f 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -331,13 +331,13 @@ action(set_vm_memory_high_watermark, Node, [Arg], _Opts, Inform) -> action(set_disk_free_limit, Node, [Arg], _Opts, Inform) -> Bytes = list_to_integer(Arg), Inform("Setting disk free space limit on ~p to ~p bytes", [Node, Bytes]), - rpc_call(Node, disk_monitor, set_disk_free_limit, [Bytes]); + rpc_call(Node, rabbit_disk_monitor, set_disk_free_limit, [Bytes]); action(set_disk_free_limit_mem_relative, Node, [Arg], _Opts, Inform) -> Mult = format_float(Arg), Inform("Setting disk free space limit on ~p to ~p times total RAM", [Node, Mult]), - rpc_call(Node, disk_monitor, set_disk_free_limit, [{mem_relative, Mult}]); + rpc_call(Node, rabbit_disk_monitor, set_disk_free_limit, [{mem_relative, Mult}]); action(set_permissions, Node, [Username, CPerm, WPerm, RPerm], Opts, Inform) -> VHost = proplists:get_value(?VHOST_OPT, Opts), diff --git a/src/disk_monitor.erl b/src/rabbit_disk_monitor.erl index 1229bd6eaf..cb2de32521 100644 --- a/src/disk_monitor.erl +++ b/src/rabbit_disk_monitor.erl @@ -14,7 +14,7 @@ %% Copyright (c) 2007-2012 VMware, Inc. All rights reserved. %% --module(disk_monitor). +-module(rabbit_disk_monitor). -behaviour(gen_server). |