diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2014-01-22 15:14:00 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2014-01-22 15:14:00 +0000 |
| commit | 140f3de392804f2f069411317c3325dacb59fe3a (patch) | |
| tree | 4f3a4fa2c0b8f3a5dfb6982654ba563e251c5304 /src | |
| parent | 0363ebd8e391931635725a23c9372e6752bcf52b (diff) | |
| parent | 32e9645e513b2b9180810dc4dc344bd7bef9e3ad (diff) | |
| download | rabbitmq-server-git-140f3de392804f2f069411317c3325dacb59fe3a.tar.gz | |
merge default into bug24297
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_queue_consumers.erl | 29 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 2 |
3 files changed, 16 insertions, 17 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 76e11dffb2..73410ae5db 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -153,7 +153,7 @@ non_neg_integer(), boolean()) -> 'ok'). -spec(basic_consume/9 :: (rabbit_types:amqqueue(), boolean(), pid(), pid(), boolean(), - rabbit_types:ctag(), boolean(), any(), any()) + rabbit_types:ctag(), boolean(), rabbit_framing:amqp_table(), any()) -> rabbit_types:ok_or_error('exclusive_consume_unavailable')). -spec(basic_cancel/4 :: (rabbit_types:amqqueue(), pid(), rabbit_types:ctag(), any()) -> 'ok'). diff --git a/src/rabbit_queue_consumers.erl b/src/rabbit_queue_consumers.erl index 6024889c71..ca47b43442 100644 --- a/src/rabbit_queue_consumers.erl +++ b/src/rabbit_queue_consumers.erl @@ -67,8 +67,7 @@ -spec count() -> non_neg_integer(). -spec unacknowledged_message_count() -> non_neg_integer(). -spec add(ch(), rabbit_types:ctag(), boolean(), pid(), boolean(), - rabbit_framing:amqp_table(), boolean(), - state()) -> state(). + rabbit_framing:amqp_table(), boolean(), state()) -> state(). -spec remove(ch(), rabbit_types:ctag(), state()) -> 'not_found' | state(). -spec erase_ch(ch(), state()) -> @@ -142,19 +141,6 @@ add(ChPid, CTag, NoAck, LimiterPid, LimiterActive, Args, IsEmpty, args = Args}, State#state{consumers = add_consumer({ChPid, Consumer}, Consumers)}. -parse_credit_args(Args) -> - case rabbit_misc:table_lookup(Args, <<"x-credit">>) of - {table, T} -> case {rabbit_misc:table_lookup(T, <<"credit">>), - rabbit_misc:table_lookup(T, <<"drain">>)} of - {{long, C}, {bool, D}} -> {C, drain_mode(D)}; - _ -> none - end; - undefined -> case rabbit_misc:table_lookup(Args, <<"x-prefetch">>) of - {_, Prefetch} -> {Prefetch, auto}; - _ -> none - end - end. - remove(ChPid, ConsumerTag, State = #state{consumers = Consumers}) -> case lookup_ch(ChPid) of not_found -> @@ -349,6 +335,19 @@ utilisation(#state{use = {inactive, Since, Active, Avg}}) -> %%---------------------------------------------------------------------------- +parse_credit_args(Args) -> + case rabbit_misc:table_lookup(Args, <<"x-credit">>) of + {table, T} -> case {rabbit_misc:table_lookup(T, <<"credit">>), + rabbit_misc:table_lookup(T, <<"drain">>)} of + {{long, C}, {bool, D}} -> {C, drain_mode(D)}; + _ -> none + end; + undefined -> case rabbit_misc:table_lookup(Args, <<"x-prefetch">>) of + {_, Prefetch} -> {Prefetch, auto}; + _ -> none + end + end. + lookup_ch(ChPid) -> case get({ch, ChPid}) of undefined -> not_found; diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 054db8ae34..731351f079 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -1172,7 +1172,7 @@ test_server_status() -> rabbit_misc:r(<<"/">>, queue, Name), false, false, [], none)]], ok = rabbit_amqqueue:basic_consume( - Q, true, Ch, Limiter, false, <<"ctag">>, true, none, [], undefined), + Q, true, Ch, Limiter, false, <<"ctag">>, true, [], undefined), %% list queues ok = info_action(list_queues, rabbit_amqqueue:info_keys(), true), |