summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkjnilsson <knilsson@pivotal.io>2020-10-19 11:00:36 +0100
committerkjnilsson <knilsson@pivotal.io>2020-10-19 11:00:36 +0100
commit402c53ef38cdb10bd0492c0fb73e14f59b9b188d (patch)
treee79f72ca9f559f0e5f38f44a9eb03f7ea721380a
parentbfe9eebc635d7a1b13981bf66995279d7d4c48c0 (diff)
downloadrabbitmq-server-git-402c53ef38cdb10bd0492c0fb73e14f59b9b188d.tar.gz
Add missing consumer args to queue type capabilities
Both classic and quorum queues were missing x-credit which is used by the AMQP 1.0 implemention. Also classic queues were missing x-priority for consumer priority support.
-rw-r--r--src/rabbit_classic_queue.erl4
-rw-r--r--src/rabbit_quorum_queue.erl2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/rabbit_classic_queue.erl b/src/rabbit_classic_queue.erl
index 5830c11f65..45cb43dbd1 100644
--- a/src/rabbit_classic_queue.erl
+++ b/src/rabbit_classic_queue.erl
@@ -453,7 +453,9 @@ capabilities() ->
<<"x-max-in-memory-bytes">>, <<"x-max-priority">>,
<<"x-overflow">>, <<"x-queue-mode">>, <<"x-single-active-consumer">>,
<<"x-queue-type">>, <<"x-queue-master-locator">>],
- consumer_arguments => [<<"x-cancel-on-ha-failover">>],
+ consumer_arguments => [<<"x-cancel-on-ha-failover">>,
+ <<"x-priority">>, <<"x-credit">>
+ ],
server_named => true}.
reject_seq_no(SeqNo, U0) ->
diff --git a/src/rabbit_quorum_queue.erl b/src/rabbit_quorum_queue.erl
index c0b1aa0965..9d42db2169 100644
--- a/src/rabbit_quorum_queue.erl
+++ b/src/rabbit_quorum_queue.erl
@@ -340,7 +340,7 @@ capabilities() ->
<<"x-max-in-memory-bytes">>, <<"x-overflow">>,
<<"x-single-active-consumer">>, <<"x-queue-type">>,
<<"x-quorum-initial-group-size">>, <<"x-delivery-limit">>],
- consumer_arguments => [<<"x-priority">>],
+ consumer_arguments => [<<"x-priority">>, <<"x-credit">>],
server_named => false}.
rpc_delete_metrics(QName) ->