diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-01-13 17:10:45 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-01-13 17:10:45 +0000 |
| commit | 06e1ba388e8a39295d0b0edc75a965503d25c11a (patch) | |
| tree | 909cff1333a766059904190cc5813d9ea78e31e8 | |
| parent | 253e8e3aab9f4b134b7f2d8930ad80a9e06b2a59 (diff) | |
| download | rabbitmq-server-git-06e1ba388e8a39295d0b0edc75a965503d25c11a.tar.gz | |
Undo accidental unification
| -rw-r--r-- | src/rabbit_queue_consumers.erl | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/rabbit_queue_consumers.erl b/src/rabbit_queue_consumers.erl index 3ba337ae13..9106ef02bd 100644 --- a/src/rabbit_queue_consumers.erl +++ b/src/rabbit_queue_consumers.erl @@ -132,11 +132,14 @@ add(ChPid, ConsumerTag, NoAck, LimiterPid, LimiterActive, CreditArgs, Args, C1 = C#cr{consumer_count = Count + 1, limiter = Limiter1}, update_ch_record( case CreditArgs of - none -> C1; - {credit, C, D} -> credit_and_drain(C1, ConsumerTag, C, D, IsEmpty); - {prefetch, P} -> Limiter2 = rabbit_limiter:set_consumer_prefetch( - Limiter1, ConsumerTag, NoAck, P), - C1#cr{limiter = Limiter2} + none -> + C1; + {credit, Credit, Drain} -> + credit_and_drain(C1, ConsumerTag, Credit, Drain, IsEmpty); + {prefetch, P} -> + Limiter2 = rabbit_limiter:set_consumer_prefetch( + Limiter1, ConsumerTag, NoAck, P), + C1#cr{limiter = Limiter2} end), Consumer = #consumer{tag = ConsumerTag, ack_required = not NoAck, |