diff options
| author | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2018-10-25 09:24:21 +0200 |
|---|---|---|
| committer | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2018-10-25 09:24:21 +0200 |
| commit | 5745100835f4ea95e5ff6cd92d949ddc7dd296a2 (patch) | |
| tree | d7680714903f3ea21fc1bb7723dbbd8f89b19fef | |
| parent | 1611df56b29b908af24ccc5fb4cf7b6fb20adde8 (diff) | |
| download | rabbitmq-server-git-5745100835f4ea95e5ff6cd92d949ddc7dd296a2.tar.gz | |
Use x-single-active-consumer queue argument
Instead of x-exclusive-consumer.
[#161090309]
References #1743
| -rw-r--r-- | src/rabbit_amqqueue.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 2 | ||||
| -rw-r--r-- | test/exclusive_consumer_SUITE.erl | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 539cc7287d..105c928305 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -576,7 +576,7 @@ declare_args() -> {<<"x-max-priority">>, fun check_max_priority_arg/2}, {<<"x-overflow">>, fun check_overflow/2}, {<<"x-queue-mode">>, fun check_queue_mode/2}, - {<<"x-exclusive-consumer">>, fun check_exclusive_consumer_arg/2}]. + {<<"x-single-active-consumer">>, fun check_single_active_consumer_arg/2}]. consume_args() -> [{<<"x-priority">>, fun check_int_arg/2}, {<<"x-cancel-on-ha-failover">>, fun check_bool_arg/2}]. @@ -617,7 +617,7 @@ check_max_priority_arg({Type, Val}, Args) -> Error -> Error end. -check_exclusive_consumer_arg({Type, Val}, Args) -> +check_single_active_consumer_arg({Type, Val}, Args) -> case check_bool_arg({Type, Val}, Args) of ok -> ok; Error -> Error diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index e539dad2a3..7ce264e185 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -157,7 +157,7 @@ init(Q) -> ?MODULE}. init_state(Q) -> - ExclusiveConsumerOn = case rabbit_misc:table_lookup(Q#amqqueue.arguments, <<"x-exclusive-consumer">>) of + ExclusiveConsumerOn = case rabbit_misc:table_lookup(Q#amqqueue.arguments, <<"x-single-active-consumer">>) of {bool, true} -> true; _ -> false end, diff --git a/test/exclusive_consumer_SUITE.erl b/test/exclusive_consumer_SUITE.erl index 9aaf3df78e..1ba05b9841 100644 --- a/test/exclusive_consumer_SUITE.erl +++ b/test/exclusive_consumer_SUITE.erl @@ -18,7 +18,7 @@ -include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). --include("amqp_client.hrl"). +-include_lib("amqp_client/include/amqp_client.hrl"). -compile(export_all). @@ -182,7 +182,7 @@ connection_and_channel(Config) -> {C, Ch}. queue_declare(Channel) -> - Declare = #'queue.declare'{arguments = [{"x-exclusive-consumer", bool, true}], + Declare = #'queue.declare'{arguments = [{"x-single-active-consumer", bool, true}], auto_delete = true}, #'queue.declare_ok'{queue = Q} = amqp_channel:call(Channel, Declare), Q. |