diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2013-01-15 18:50:56 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2013-01-15 18:50:56 +0000 |
| commit | 097182274da2cd2d5a37ac35f6add7d06963ba76 (patch) | |
| tree | 526e2a46a7b523342e09c74d54a88ec8034ea4b5 | |
| parent | 2ad15707cb8ccf7c192fb619b4bdb5032fd40b9c (diff) | |
| download | rabbitmq-server-097182274da2cd2d5a37ac35f6add7d06963ba76.tar.gz | |
API consistency
| -rw-r--r-- | src/rabbit_amqqueue.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_channel.erl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 1f2d653e..788ec558 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -145,7 +145,7 @@ -spec(notify_down_all/2 :: (qpids(), pid()) -> ok_or_errors()). -spec(limit_all/3 :: (qpids(), pid(), rabbit_limiter:token()) -> ok_or_errors()). --spec(inform_limiter/3 :: (pid(), pid(), any()) -> 'ok'). +-spec(inform_limiter/3 :: (rabbit_types:amqqueue(), pid(), any()) -> 'ok'). -spec(basic_get/3 :: (rabbit_types:amqqueue(), pid(), boolean()) -> {'ok', non_neg_integer(), qmsg()} | 'empty'). -spec(basic_consume/7 :: @@ -534,7 +534,7 @@ notify_down_all(QPids, ChPid) -> limit_all(QPids, ChPid, Limiter) -> delegate:cast(QPids, {limit, ChPid, Limiter}). -inform_limiter(ChPid, QPid, Msg) -> +inform_limiter(#amqqueue{pid = QPid}, ChPid, Msg) -> delegate:cast(QPid, {inform_limiter, ChPid, Msg}). basic_get(#amqqueue{pid = QPid}, ChPid, NoAck) -> diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 2bc2db83..8d916703 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -1100,7 +1100,7 @@ handle_method(#'basic.credit'{consumer_tag = CTag, credit_map = CMap}) -> case dict:find(CTag, Consumers) of {ok, Q} -> ok = rabbit_amqqueue:inform_limiter( - self(), Q#amqqueue.pid, + Q, self(), {basic_credit, CTag, Credit, Count, Drain, true}), {noreply, State}; error -> CMap2 = dict:store(CTag, {Credit, Count, Drain}, CMap), |