diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-09-17 07:01:39 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-09-17 07:01:39 +0100 |
| commit | e4c7c23552b3d5fc625513d217340193ed941fff (patch) | |
| tree | dc3cc5e744f819ce9343cce33b8542683d33a23d | |
| parent | 08f1247b8a6915e1017527ac860617c49f284f36 (diff) | |
| parent | 92a6b83f2b696560369a6d207ca826239bec5a23 (diff) | |
| download | rabbitmq-server-git-e4c7c23552b3d5fc625513d217340193ed941fff.tar.gz | |
merge bug25154 into default
| -rw-r--r-- | src/rabbit_disk_monitor.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_disk_monitor.erl b/src/rabbit_disk_monitor.erl index e72181c061..40193320ad 100644 --- a/src/rabbit_disk_monitor.erl +++ b/src/rabbit_disk_monitor.erl @@ -148,10 +148,10 @@ internal_update(State = #state { limit = Limit, NewAlarmed = CurrentFreeBytes < LimitBytes, case {Alarmed, NewAlarmed} of {false, true} -> - emit_update_info("exceeded", CurrentFreeBytes, LimitBytes), + emit_update_info("insufficient", CurrentFreeBytes, LimitBytes), rabbit_alarm:set_alarm({{resource_limit, disk, node()}, []}); {true, false} -> - emit_update_info("below limit", CurrentFreeBytes, LimitBytes), + emit_update_info("sufficient", CurrentFreeBytes, LimitBytes), rabbit_alarm:clear_alarm({resource_limit, disk, node()}); _ -> ok @@ -187,10 +187,10 @@ interpret_limit({mem_relative, R}) -> interpret_limit(L) -> L. -emit_update_info(State, CurrentFree, Limit) -> +emit_update_info(StateStr, CurrentFree, Limit) -> rabbit_log:info( - "Disk free space limit now ~s. Free bytes:~p Limit:~p~n", - [State, CurrentFree, Limit]). + "Disk free space ~s. Free bytes:~p Limit:~p~n", + [StateStr, CurrentFree, Limit]). start_timer(Timeout) -> {ok, TRef} = timer:send_interval(Timeout, update), |