summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2011-01-14 10:15:47 +0000
committerAlexandru Scvortov <alexandru@rabbitmq.com>2011-01-14 10:15:47 +0000
commitf5ef17aac0a739db3519ade1f9a71bdc0e42bdc8 (patch)
tree840b8c61a70d99c774fe2677b62160ad03a48b11
parent8121825600b956e1523a0adc7ee8e83488873711 (diff)
downloadrabbitmq-server-f5ef17aac0a739db3519ade1f9a71bdc0e42bdc8.tar.gz
for queues, log partial confirms rather than full confirms
-rw-r--r--src/rabbit_channel.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 5bc04170..8c91e717 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -524,7 +524,7 @@ confirm(MsgSeqNos, QPid, XName, State) ->
end
end
end, {[], State}, MsgSeqNos),
- maybe_incr_stats([{{QPid, XName}, length(DoneMessages)}], confirm, State),
+ maybe_incr_stats([{{QPid, XName}, length(MsgSeqNos)}], confirm, State),
send_confirms(DoneMessages, XName, State1).
group_confirms_by_exchange([], Acc) ->
@@ -1271,7 +1271,7 @@ send_confirms([], _, State) ->
send_confirms([MsgSeqNo], XName,
State = #ch{writer_pid = WriterPid}) ->
send_confirm(MsgSeqNo, WriterPid),
- maybe_incr_confirm_exchange_stats([MsgSeqNo], XName, State);
+ maybe_incr_confirm_exchange_stats_and_cleanup([MsgSeqNo], XName, State);
send_confirms(Cs, XName,
State = #ch{writer_pid = WriterPid, unconfirmed = UC}) ->
SCs = lists:usort(Cs),
@@ -1287,9 +1287,9 @@ send_confirms(Cs, XName,
multiple = true})
end,
[ok = send_confirm(SeqNo, WriterPid) || SeqNo <- Ss],
- maybe_incr_confirm_exchange_stats(Cs, XName, State).
+ maybe_incr_confirm_exchange_stats_and_cleanup(Cs, XName, State).
-maybe_incr_confirm_exchange_stats(Cs, XName, State) ->
+maybe_incr_confirm_exchange_stats_and_cleanup(Cs, XName, State) ->
maybe_incr_stats([{XName, length(Cs)}], confirm, State),
lists:foldl(fun(MsgSeqNo, State0 = #ch{exchange_for_msg = EFM}) ->
State0#ch{exchange_for_msg =