diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-07-26 13:44:11 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-07-26 13:44:11 +0100 |
| commit | 157de0376acb3aa95184fb9c50d3fb68fdf82fff (patch) | |
| tree | f59d0276b186fc8653248cf0747f83aa71c6737f | |
| parent | 08aff2a628cb92a891e7e600d5420e207595be8e (diff) | |
| download | rabbitmq-server-157de0376acb3aa95184fb9c50d3fb68fdf82fff.tar.gz | |
remove useless cases
| -rw-r--r-- | src/rabbit_channel.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_limiter.erl | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 629b1bb9..925e1f26 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -1288,8 +1288,8 @@ enable_limiter(State = #ch{unacked_message_q = UAMQ, ok = limit_queues(Limiter1, State), Limiter1. -limit_queues(Token, #ch{consumer_mapping = Consumers}) -> - rabbit_amqqueue:limit_all(consumer_queues(Consumers), self(), Token). +limit_queues(Limiter, #ch{consumer_mapping = Consumers}) -> + rabbit_amqqueue:limit_all(consumer_queues(Consumers), self(), Limiter). consumer_queues(Consumers) -> lists:usort([QPid || diff --git a/src/rabbit_limiter.erl b/src/rabbit_limiter.erl index bece8090..beffe341 100644 --- a/src/rabbit_limiter.erl +++ b/src/rabbit_limiter.erl @@ -83,15 +83,11 @@ limit(Limiter, PrefetchCount) -> %% Ask the limiter whether the queue can deliver a message without %% breaching a limit -can_send(undefined, _QPid, _AckRequired) -> - true; -can_send(#token{enabled = false}, _QPid, _AckRequired) -> - true; can_send(Limiter, QPid, AckRequired) -> rabbit_misc:with_exit_handler( fun () -> true end, fun () -> - maybe_call(Limiter, {can_send, QPid, AckRequired}, ok) + maybe_call(Limiter, {can_send, QPid, AckRequired}, true) end). %% Let the limiter know that the channel has received some acks from a |