summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@novemberain.com>2015-12-13 04:27:03 +0300
committerMichael Klishin <michael@novemberain.com>2015-12-13 04:27:03 +0300
commitc275c0aa589060955b19ecf891850762898c9557 (patch)
treee8bec724e2a13f9f9793130de54bbd2ed8f8e9b3
parentc7e03fd9c17be97d9f5db31e240a4e5457fae717 (diff)
parent05162cba78c3999d9be5ed833f24e1e34a51fda1 (diff)
downloadrabbitmq-server-git-c275c0aa589060955b19ecf891850762898c9557.tar.gz
Merge pull request #489 from rabbitmq/rabbitmq-server-488
Handle queue mode statistic emitted by priority queues
-rw-r--r--src/rabbit_priority_queue.erl6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/rabbit_priority_queue.erl b/src/rabbit_priority_queue.erl
index 7439b5bc32..b58a8c535e 100644
--- a/src/rabbit_priority_queue.erl
+++ b/src/rabbit_priority_queue.erl
@@ -647,6 +647,12 @@ combine_status(P, New, Old) ->
cse(infinity, _) -> infinity;
cse(_, infinity) -> infinity;
+%% queue modes
+cse(_, default) -> default;
+cse(default, _) -> default;
+cse(_, lazy) -> lazy;
+cse(lazy, _) -> lazy;
+%% numerical stats
cse(A, B) when is_number(A) -> A + B;
cse({delta, _, _, _}, _) -> {delta, todo, todo, todo};
cse(A, B) -> exit({A, B}).