diff options
| -rw-r--r-- | src/rabbit_channel.erl | 12 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 3 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index aedd17c89c..ef33a64cf5 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -50,7 +50,7 @@ uncommitted_ack_q, unacked_message_q, username, virtual_host, most_recently_declared_queue, consumer_mapping, blocking, queue_collector_pid, flow, - queue_exchange_stats, stats_timer_ref}). + stats_timer_ref}). -record(flow, {server, client, pending}). @@ -189,7 +189,6 @@ init([Channel, ReaderPid, WriterPid, Username, VHost, CollectorPid]) -> queue_collector_pid = CollectorPid, flow = #flow{server = true, client = true, pending = none}, - queue_exchange_stats = dict:new(), stats_timer_ref = undefined}, hibernate, {backoff, ?HIBERNATE_AFTER_MIN, ?HIBERNATE_AFTER_MIN, ?DESIRED_HIBERNATE}}. @@ -314,8 +313,7 @@ noreply(NewState) -> ensure_stats_timer(State = #ch{stats_timer_ref = undefined}) -> {ok, TRef} = timer:apply_after(?STATS_INTERVAL, - rabbit_channel, emit_stats, - [self()]), + rabbit_channel, emit_stats, [self()]), State#ch{stats_timer_ref = TRef}; ensure_stats_timer(State) -> State. @@ -498,9 +496,9 @@ handle_method(#'basic.ack'{delivery_tag = DeliveryTag, _, State = #ch{transaction_id = TxnKey, unacked_message_q = UAMQ}) -> {Acked, Remaining} = collect_acks(UAMQ, DeliveryTag, Multiple), - QsIncs = ack(TxnKey, Acked), - Participants = [QPid || {QPid, _} <- QsIncs], - incr_stats(QsIncs, ack), + QIncs = ack(TxnKey, Acked), + Participants = [QPid || {QPid, _} <- QIncs], + incr_stats(QIncs, ack), {noreply, case TxnKey of none -> ok = notify_limiter(State#ch.limiter_pid, Acked), State#ch{unacked_message_q = Remaining}; diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index d96d5066e6..ab1570634e 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -602,8 +602,7 @@ check_version(ClientVersion, ServerVersion) -> ensure_stats_timer(State = #v1{stats_timer_ref = undefined}) -> {ok, TRef} = timer:apply_after(?STATS_INTERVAL, - rabbit_reader, emit_stats, - [self()]), + rabbit_reader, emit_stats, [self()]), State#v1{stats_timer_ref = TRef}; ensure_stats_timer(State) -> State. |