summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLuke Bakken <luke@bakken.io>2018-08-13 11:48:55 -0700
committerGitHub <noreply@github.com>2018-08-13 11:48:55 -0700
commitd35fe7cdc0f60182a92358835c3bdb7ec3005e69 (patch)
tree6b3c536a5b6d2e2ee2d05b03747e23d9061ab99e /src
parent7af8fd244c5d5059ac0b3d2931dcbc7210754d55 (diff)
parent000cc324c651ed019ed6ccb5ddcaabb5648a5721 (diff)
downloadrabbitmq-server-git-d35fe7cdc0f60182a92358835c3bdb7ec3005e69.tar.gz
Merge pull request #1669 from noxdafox/priority-info
Handle generic data structures in priority queue info callback
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_priority_queue.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_priority_queue.erl b/src/rabbit_priority_queue.erl
index b1eb83dddc..7b75dd4afd 100644
--- a/src/rabbit_priority_queue.erl
+++ b/src/rabbit_priority_queue.erl
@@ -666,8 +666,8 @@ cse(_, lazy) -> lazy;
cse(lazy, _) -> lazy;
%% numerical stats
cse(A, B) when is_number(A) -> A + B;
-cse({delta, _, _, _, _}, _) -> {delta, todo, todo, todo, todo};
-cse(A, B) -> exit({A, B}).
+cse({delta, _, _, _, _}, _) -> {delta, todo, todo, todo, todo};
+cse(_, _) -> undefined.
%% When asked about 'head_message_timestamp' fro this priority queue, we
%% walk all the backing queues, starting by the highest priority. Once a