diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-08-27 12:22:02 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-08-27 12:22:02 +0100 |
| commit | 452ec5b61e50506aa44047fdea0701547726ba68 (patch) | |
| tree | 6d928d0d3a63288d8afb9882e915111860eb952d /src | |
| parent | 9621889821c49e51e44f6298eeea10767f2825a5 (diff) | |
| download | rabbitmq-server-git-452ec5b61e50506aa44047fdea0701547726ba68.tar.gz | |
cosmetic - MarkerCount => MarkerPreludeCount
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_mixed_queue.erl | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/rabbit_mixed_queue.erl b/src/rabbit_mixed_queue.erl index f0dcea1562..9cdca26150 100644 --- a/src/rabbit_mixed_queue.erl +++ b/src/rabbit_mixed_queue.erl @@ -103,20 +103,21 @@ init(Queue, IsDurable) -> Len = rabbit_disk_queue:len(Queue), - {Size, MarkerFound, MarkerCount} = rabbit_disk_queue:foldl( + {Size, MarkerFound, MarkerPreludeCount} = rabbit_disk_queue:foldl( fun (Msg = #basic_message { is_persistent = true }, - _AckTag, _IsDelivered, {SizeAcc, MFound, MCount}) -> + _AckTag, _IsDelivered, {SizeAcc, MFound, MPCount}) -> SizeAcc1 = SizeAcc + size_of_message(Msg), case {MFound, is_magic_marker_message(Msg)} of - {false, false} -> {SizeAcc1, false, MCount + 1}; - {false, true} -> {SizeAcc, true, MCount}; - {true, false} -> {SizeAcc1, true, MCount} + {false, false} -> {SizeAcc1, false, MPCount + 1}; + {false, true} -> {SizeAcc, true, MPCount}; + {true, false} -> {SizeAcc1, true, MPCount} end end, {0, false, 0}, Queue), Len1 = case MarkerFound of false -> Len; true -> - ok = rabbit_disk_queue:requeue_next_n(Queue, MarkerCount), + ok = rabbit_disk_queue:requeue_next_n(Queue, + MarkerPreludeCount), Len2 = Len - 1, {ok, Len2} = fetch_ack_magic_marker_message(Queue), Len2 |
