diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2012-03-26 13:24:48 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2012-03-26 13:24:48 +0100 |
| commit | 66b7eaae86e6444eb7561ced62ae941298190998 (patch) | |
| tree | 4dc3ad2243b993a7e57da3ff8386e7fe5c022611 | |
| parent | 7b7fcea38aaf609eebe0d29445d0bed7259a39cd (diff) | |
| download | rabbitmq-server-66b7eaae86e6444eb7561ced62ae941298190998.tar.gz | |
Wrap long lines
| -rw-r--r-- | src/rabbit.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_alarm.erl | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 84a08412..32e4af68 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -328,7 +328,7 @@ status() -> get_vm_memory_high_watermark, []}}, {vm_memory_limit, {vm_memory_monitor, get_memory_limit, []}}, - {disk_free_limit, {disk_monitor, + {disk_free_limit, {rabbit_disk_monitor, get_disk_free_limit, []}}]), S3 = rabbit_misc:with_exit_handler( fun () -> [] end, diff --git a/src/rabbit_alarm.erl b/src/rabbit_alarm.erl index d207fe00..a286eea4 100644 --- a/src/rabbit_alarm.erl +++ b/src/rabbit_alarm.erl @@ -48,11 +48,14 @@ start() -> {ok, DiskLimit} = application:get_env(disk_free_limit), rabbit_sup:start_restartable_child(rabbit_disk_monitor, [DiskLimit]), - case {vm_memory_monitor:get_total_memory(), rabbit_disk_monitor:get_disk_free()} of - {N1, N2} when is_integer(N1), is_integer(N2) -> ok; - _ -> error_logger:warning_msg("Disabling disk free space monitoring " - "on unsupported platform~n"), - ok = rabbit_sup:stop_child(rabbit_disk_monitor_sup) + case {vm_memory_monitor:get_total_memory(), + rabbit_disk_monitor:get_disk_free()} of + {N1, N2} when is_integer(N1), is_integer(N2) -> + ok; + _ -> + error_logger:warning_msg("Disabling disk free space monitoring " + "on unsupported platform~n"), + ok = rabbit_sup:stop_child(rabbit_disk_monitor_sup) end, ok. @@ -104,7 +107,7 @@ handle_event({node_up, Node}, State) -> {ok, State}; handle_event({node_down, Node}, State) -> - {ok, maybe_alert(fun dict_unappend_all/2, Node, [], State)}; + {ok, maybe_alert(fun dict_unappend_all/3, Node, [], State)}; handle_event({register, Pid, HighMemMFA}, State) -> {ok, internal_register(Pid, HighMemMFA, State)}; @@ -127,7 +130,7 @@ code_change(_OldVsn, State, _Extra) -> %%---------------------------------------------------------------------------- -dict_unappend_all(Key, Dict) -> +dict_unappend_all(Key, _Val, Dict) -> dict:erase(Key, Dict). dict_unappend(Key, Val, Dict) -> |