diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-01-04 18:12:27 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-01-04 18:12:27 +0000 |
| commit | 67b1873a34f3794ae1c833a57d64c33e025bf49a (patch) | |
| tree | 0f8edf7c19d0361aef0dbcf3495c7496bde7fc31 | |
| parent | ed4e00789e2b1086ee4424f4fb0d5b7e1e9493af (diff) | |
| download | rabbitmq-server-67b1873a34f3794ae1c833a57d64c33e025bf49a.tar.gz | |
tiny refactor
| -rw-r--r-- | src/rabbit_memory_monitor.erl | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/src/rabbit_memory_monitor.erl b/src/rabbit_memory_monitor.erl index 02f3158f..b3b4b093 100644 --- a/src/rabbit_memory_monitor.erl +++ b/src/rabbit_memory_monitor.erl @@ -240,26 +240,21 @@ internal_update(State = #state { queue_durations = Durations, fun (Proc = #process { reported = QueueDuration, sent = PrevSendDuration, callback = {M, F, A} }, true) -> - case (case {QueueDuration, PrevSendDuration} of - {infinity, infinity} -> - true; - {infinity, D} -> - DesiredDurationAvg1 < D; - {D, infinity} -> - DesiredDurationAvg1 < D; - {D1, D2} -> - DesiredDurationAvg1 < - lists:min([D1,D2]) - end) of - true -> - ok = erlang:apply( - M, F, A ++ [DesiredDurationAvg1]), - ets:insert( - Durations, - Proc #process {sent = DesiredDurationAvg1}); - false -> - true + case should_send(QueueDuration, PrevSendDuration, + DesiredDurationAvg1) of + true -> ok = erlang:apply( + M, F, A ++ [DesiredDurationAvg1]), + ets:insert( + Durations, + Proc #process { + sent = DesiredDurationAvg1}); + false -> true end end, true, Durations) end, State1. + +should_send(infinity, infinity, _) -> true; +should_send(infinity, D, DD) -> DD < D; +should_send(D, infinity, DD) -> DD < D; +should_send(D1, D2, DD) -> DD < lists:min([D1, D2]). |