diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2014-03-03 15:24:20 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2014-03-03 15:24:20 +0000 |
| commit | 8bc5daa7c408bd832f289313f6cd545de2efa310 (patch) | |
| tree | 46424bf2aed6b40b7fb488970d7eb51cecc83692 | |
| parent | 9bb49c6023792b059bbc8c335f1ef7a5b21a2b82 (diff) | |
| parent | 1f6e7c72043b6734b9fe6e5ad48285b1091b9b46 (diff) | |
| download | rabbitmq-server-git-8bc5daa7c408bd832f289313f6cd545de2efa310.tar.gz | |
merge in default
| -rw-r--r-- | src/rabbit_variable_queue.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index a84f2e38c2..c8cafa5785 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -801,8 +801,9 @@ ram_duration(State) -> RamAckCount = gb_trees:size(RPA), Duration = %% msgs+acks / (msgs+acks/sec) == sec - case (AvgEgressRate == 0 andalso AvgIngressRate == 0 andalso - AvgAckEgressRate == 0 andalso AvgAckIngressRate == 0) of + case lists:all(fun (X) -> X < 0.01 end, + [AvgEgressRate, AvgIngressRate, + AvgAckEgressRate, AvgAckIngressRate]) of true -> infinity; false -> (RamMsgCountPrev + RamMsgCount + RamAckCount + RamAckCountPrev) / |