diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-07-25 11:27:42 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-07-25 11:27:42 +0100 |
| commit | 8aab89ccc78ef61e5833ed058f335b9a51a819d1 (patch) | |
| tree | 7ad17246f40ad2a48147535f59a236738856fb59 /src | |
| parent | d1c7a8697c8d59f56bff84d4ae6302d0ba893691 (diff) | |
| download | rabbitmq-server-git-8aab89ccc78ef61e5833ed058f335b9a51a819d1.tar.gz | |
Face down, nine-edge first.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_channel.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_limiter.erl | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index f441adc88f..0610af653e 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -1122,7 +1122,8 @@ handle_method(#'basic.credit'{consumer_tag = CTag, Other -> Other end, LimiterPid2 = - case rabbit_limiter:set_credit(LimiterPid1, CTag, Credit, Count, Drain) of + case rabbit_limiter:set_credit( + LimiterPid1, CTag, Credit, Count, Drain) of ok -> limit_queues(LimiterPid1, State), LimiterPid1; stopped -> unlimit_queues(State) diff --git a/src/rabbit_limiter.erl b/src/rabbit_limiter.erl index 7729a10a2f..81f973e476 100644 --- a/src/rabbit_limiter.erl +++ b/src/rabbit_limiter.erl @@ -36,7 +36,9 @@ -spec(start_link/2 :: (pid(), non_neg_integer()) -> rabbit_types:ok_pid_or_error()). -spec(limit/2 :: (maybe_pid(), non_neg_integer()) -> 'ok' | 'stopped'). --spec(can_send/5 :: (maybe_pid(), pid(), boolean(), binary(), non_neg_integer()) -> boolean()). +-spec(can_send/5 :: + (maybe_pid(), pid(), boolean(), binary(), non_neg_integer()) + -> boolean()). -spec(ack/2 :: (maybe_pid(), binary()) -> 'ok'). -spec(register/2 :: (maybe_pid(), pid()) -> 'ok'). -spec(unregister/2 :: (maybe_pid(), pid()) -> 'ok'). @@ -116,7 +118,8 @@ unblock(LimiterPid) -> set_credit(undefined, _, _, _, _) -> ok; set_credit(LimiterPid, CTag, Credit, Count, Drain) -> - gen_server2:call(LimiterPid, {set_credit, CTag, Credit, Count, Drain}, infinity). + gen_server2:call( + LimiterPid, {set_credit, CTag, Credit, Count, Drain}, infinity). is_blocked(undefined) -> false; @@ -164,7 +167,8 @@ handle_call(unblock, _From, State) -> maybe_notify_reply(irrelevant, State, State#lim{blocked = false}); handle_call({set_credit, CTag, Credit, Count, Drain}, _From, State) -> - maybe_notify_reply(CTag, State, reset_credit(CTag, Credit, Count, Drain, State)); + maybe_notify_reply(CTag, State, + reset_credit(CTag, Credit, Count, Drain, State)); handle_call(is_blocked, _From, State) -> {reply, blocked(State), State}. |