diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2013-09-26 18:20:29 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2013-09-26 18:20:29 +0100 |
| commit | 434a3ea0b5db9481452f3a435702b55c33ae56dd (patch) | |
| tree | ea7b5e7469f9af8dfca683074a03f0cac2460935 | |
| parent | ee3419c9ead7ad301fcbc710eda4ca75fe479cdd (diff) | |
| download | rabbitmq-server-git-434a3ea0b5db9481452f3a435702b55c33ae56dd.tar.gz | |
inlining
| -rw-r--r-- | src/rabbit_memory_monitor.erl | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/rabbit_memory_monitor.erl b/src/rabbit_memory_monitor.erl index 66c01298e8..62b464e0f3 100644 --- a/src/rabbit_memory_monitor.erl +++ b/src/rabbit_memory_monitor.erl @@ -209,11 +209,12 @@ internal_update(State = #state{queue_durations = Durations, desired_duration = DesiredDurationAvg, disk_alarm = DiskAlarm}) -> DesiredDurationAvg1 = desired_duration_average(State), - State1 = State#state{desired_duration = DesiredDurationAvg1}, - maybe_inform_queues( - should_inform_predicate(DiskAlarm), - DesiredDurationAvg, DesiredDurationAvg1, Durations), - State1. + ShouldInform = should_inform_predicate(DiskAlarm), + case ShouldInform(DesiredDurationAvg, DesiredDurationAvg1) of + true -> inform_queues(ShouldInform, DesiredDurationAvg1, Durations); + false -> ok + end, + State#state{desired_duration = DesiredDurationAvg1}. desired_duration_average(#state{queue_duration_sum = Sum, queue_duration_count = Count, @@ -237,13 +238,6 @@ desired_duration_average(#state{queue_duration_sum = Sum, (Sum / Count) / MemoryRatio end. -maybe_inform_queues(ShouldInform, DesiredDurationAvg, DesiredDurationAvg1, - Durations) -> - case ShouldInform(DesiredDurationAvg, DesiredDurationAvg1) of - true -> inform_queues(ShouldInform, DesiredDurationAvg1, Durations); - false -> ok - end. - inform_queues(ShouldInform, DesiredDurationAvg, Durations) -> true = ets:foldl( |