diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2019-05-15 15:12:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-15 15:12:07 +0300 |
| commit | 613573b0914932e1118235abce4e7930c1d466b4 (patch) | |
| tree | f823bbdbf23805312281c154df4474c214016b89 | |
| parent | 29935dbcdd786a22d327f65857eda16a8fd5804a (diff) | |
| parent | 7d35040a3905b0ad31a459e7385be5cb04c2b444 (diff) | |
| download | rabbitmq-server-git-613573b0914932e1118235abce4e7930c1d466b4.tar.gz | |
Merge pull request #2011 from rabbitmq/fix-notify-limiter-after-consumer-timeout-change
Adapt clause in notify_limiter to consumer timeout changes
| -rw-r--r-- | src/rabbit_channel.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 7d4b7bde4a..7c07aa07f3 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -2122,13 +2122,13 @@ notify_limiter(Limiter, Acked) -> %% common case. case rabbit_limiter:is_active(Limiter) of false -> ok; - true -> case lists:foldl(fun ({_, CTag, _}, Acc) when is_integer(CTag) -> + true -> case lists:foldl(fun ({_, CTag, _, _}, Acc) when is_integer(CTag) -> %% Quorum queues use integer CTags %% classic queues use binaries %% Quorum queues do not interact %% with limiters Acc; - ({_, _, _}, Acc) -> Acc + 1 + ({_, _, _, _}, Acc) -> Acc + 1 end, 0, Acked) of 0 -> ok; Count -> rabbit_limiter:ack(Limiter, Count) |