summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-09-26 17:27:43 +0100
committerSimon MacMullen <simon@rabbitmq.com>2013-09-26 17:27:43 +0100
commit972b94caf7db1af8a4d2e4266fc9955f84e0b77f (patch)
treeed4a9f64f05bdb47b81afcda01d759ba2ea48ed0 /src
parent4b69650126de40cc4b141715635eaf6981ce85b9 (diff)
downloadrabbitmq-server-git-972b94caf7db1af8a4d2e4266fc9955f84e0b77f.tar.gz
Ahem2.
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_memory_monitor.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_memory_monitor.erl b/src/rabbit_memory_monitor.erl
index d34909a1e6..71a5751194 100644
--- a/src/rabbit_memory_monitor.erl
+++ b/src/rabbit_memory_monitor.erl
@@ -250,8 +250,8 @@ inform_queues(ShouldInform, DesiredDurationAvg, Durations) ->
fun (Proc = #process{reported = QueueDuration,
sent = PrevSendDuration,
callback = {M, F, A}}, true) ->
- case ShouldInform(PrevSendDuration, DesiredDurationAvg) orelse
- ShouldInform(QueueDuration, DesiredDurationAvg) of
+ case ShouldInform(PrevSendDuration, DesiredDurationAvg)
+ andalso ShouldInform(QueueDuration, DesiredDurationAvg) of
true -> ok = erlang:apply(
M, F, A ++ [DesiredDurationAvg]),
ets:insert(