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 | ebb3d7e0f5157a19e86c862c924d3ab67ff301df (patch) | |
| tree | 46424bf2aed6b40b7fb488970d7eb51cecc83692 | |
| parent | 059e6cbc28d6865d14b50ea37397ece38d0c7aec (diff) | |
| parent | c03bcb90b5ce1d6035ac627500667f9b51a1e4a8 (diff) | |
| download | rabbitmq-server-ebb3d7e0f5157a19e86c862c924d3ab67ff301df.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 a84f2e38..c8cafa57 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) / |