diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-01-09 12:17:15 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-01-09 12:17:15 +0000 |
| commit | af0265053ebae4ae006fd4cca2d66bf499dd26ef (patch) | |
| tree | 03142171ba282db0cb02f4abde721015532910dc /src | |
| parent | 769872621b7982e4489f0f9d1781063d49803fa8 (diff) | |
| download | rabbitmq-server-af0265053ebae4ae006fd4cca2d66bf499dd26ef.tar.gz | |
More consistent naming
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_queue_consumers.erl | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 2bd0523d..cc511396 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -1019,7 +1019,7 @@ handle_call({basic_get, ChPid, NoAck, LimiterPid}, _From, end; handle_call({basic_consume, NoAck, ChPid, LimiterPid, LimiterActive, - ConsumerTag, ExclusiveConsume, CreditArgs, OtherArgs, OkMsg}, + ConsumerTag, ExclusiveConsume, CreditArgs, Args, OkMsg}, _From, State = #q{consumers = Consumers, exclusive_consumer = Holder}) -> case check_exclusive_access(Holder, ExclusiveConsume, State) of @@ -1027,7 +1027,7 @@ handle_call({basic_consume, NoAck, ChPid, LimiterPid, LimiterActive, ok -> Consumers1 = rabbit_queue_consumers:add( ChPid, ConsumerTag, NoAck, LimiterPid, LimiterActive, - CreditArgs, OtherArgs, + CreditArgs, Args, is_empty(State), Consumers), ExclusiveConsumer = if ExclusiveConsume -> {ChPid, ConsumerTag}; @@ -1038,7 +1038,7 @@ handle_call({basic_consume, NoAck, ChPid, LimiterPid, LimiterActive, exclusive_consumer = ExclusiveConsumer}, ok = maybe_send_reply(ChPid, OkMsg), emit_consumer_created(ChPid, ConsumerTag, ExclusiveConsume, - not NoAck, qname(State1), OtherArgs), + not NoAck, qname(State1), Args), notify_decorators(State1), reply(ok, run_message_queue(State1)) end; diff --git a/src/rabbit_queue_consumers.erl b/src/rabbit_queue_consumers.erl index 11c26f92..9dafa71a 100644 --- a/src/rabbit_queue_consumers.erl +++ b/src/rabbit_queue_consumers.erl @@ -120,7 +120,7 @@ count() -> lists:sum([Count || #cr{consumer_count = Count} <- all_ch_record()]). unacknowledged_message_count() -> lists:sum([queue:len(C#cr.acktags) || C <- all_ch_record()]). -add(ChPid, ConsumerTag, NoAck, LimiterPid, LimiterActive, CreditArgs, OtherArgs, +add(ChPid, ConsumerTag, NoAck, LimiterPid, LimiterActive, CreditArgs, Args, IsEmpty, State = #state{consumers = Consumers}) -> C = #cr{consumer_count = Count, limiter = Limiter} = ch_record(ChPid, LimiterPid), @@ -143,7 +143,7 @@ add(ChPid, ConsumerTag, NoAck, LimiterPid, LimiterActive, CreditArgs, OtherArgs, end), Consumer = #consumer{tag = ConsumerTag, ack_required = not NoAck, - args = OtherArgs}, + args = Args}, State#state{consumers = add_consumer({ChPid, Consumer}, Consumers)}. remove(ChPid, ConsumerTag, State = #state{consumers = Consumers}) -> |