diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-03-04 14:35:45 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-03-04 14:35:45 +0000 |
| commit | 5f53cd7b8c0b40c1da3bb31ad9acd5723b645996 (patch) | |
| tree | 88144a81434049bb96b812d369e16e51e66ae2a1 | |
| parent | 6244e717481bc2cc92ab321fab7dd1b2baa3e8cd (diff) | |
| download | rabbitmq-server-git-5f53cd7b8c0b40c1da3bb31ad9acd5723b645996.tar.gz | |
Strip out support for x-prefetch.
| -rw-r--r-- | src/rabbit_amqqueue.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_queue_consumers.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 1 |
3 files changed, 2 insertions, 8 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 58a07e81e7..9aed28d48e 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -436,8 +436,7 @@ declare_args() -> {<<"x-dead-letter-routing-key">>, fun check_dlxrk_arg/2}, {<<"x-max-length">>, fun check_non_neg_int_arg/2}]. -consume_args() -> [{<<"x-priority">>, fun check_int_arg/2}, - {<<"x-prefetch">>, fun check_non_neg_int_arg/2}]. +consume_args() -> [{<<"x-priority">>, fun check_int_arg/2}]. check_int_arg({Type, _}, _) -> case lists:member(Type, ?INTEGER_ARG_TYPES) of diff --git a/src/rabbit_queue_consumers.erl b/src/rabbit_queue_consumers.erl index 47b4ef3aa1..8c11d5d069 100644 --- a/src/rabbit_queue_consumers.erl +++ b/src/rabbit_queue_consumers.erl @@ -135,7 +135,6 @@ add(ChPid, CTag, NoAck, LimiterPid, LimiterActive, Prefetch, Args, IsEmpty, C1 = C#cr{consumer_count = Count + 1, limiter = Limiter1}, update_ch_record( case parse_credit_args(Prefetch, Args) of - none -> C1; {0, auto} -> C1; {_Credit, auto} when NoAck -> C1; {Credit, Mode} -> credit_and_drain( @@ -357,10 +356,7 @@ parse_credit_args(Default, Args) -> {{long, C}, {bool, D}} -> {C, drain_mode(D)}; _ -> {Default, auto} end; - undefined -> case rabbit_misc:table_lookup(Args, <<"x-prefetch">>) of - {_, Prefetch} -> {Prefetch, auto}; - _ -> {Default, auto} - end + undefined -> {Default, auto} end. lookup_ch(ChPid) -> diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 25bee173e3..3304a50b54 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -179,7 +179,6 @@ server_capabilities(rabbit_framing_amqp_0_9_1) -> {<<"consumer_cancel_notify">>, bool, true}, {<<"connection.blocked">>, bool, true}, {<<"consumer_priorities">>, bool, true}, - {<<"consumer_prefetch">>, bool, true}, {<<"authentication_failure_close">>, bool, true}]; server_capabilities(_) -> []. |