summaryrefslogtreecommitdiff
path: root/src/rabbit_queue_consumers.erl
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-01-13 17:10:45 +0000
committerSimon MacMullen <simon@rabbitmq.com>2014-01-13 17:10:45 +0000
commitbbf5eb2142e68af2891161fefb76fd686d93ef80 (patch)
tree909cff1333a766059904190cc5813d9ea78e31e8 /src/rabbit_queue_consumers.erl
parentc1c1c50966e05517924987a8e7e3264b1fd61186 (diff)
downloadrabbitmq-server-bbf5eb2142e68af2891161fefb76fd686d93ef80.tar.gz
Undo accidental unification
Diffstat (limited to 'src/rabbit_queue_consumers.erl')
-rw-r--r--src/rabbit_queue_consumers.erl13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/rabbit_queue_consumers.erl b/src/rabbit_queue_consumers.erl
index 3ba337ae..9106ef02 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,