diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-10-02 15:26:37 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-10-02 15:26:37 +0100 |
| commit | f27b0455a9468b304f61865eb5947ef30f050695 (patch) | |
| tree | 70ac440b998abc55b21c0298d7e5534a10ca0b8b | |
| parent | 993959790fe5ccca6670cd34160d0a8aaf998a5d (diff) | |
| download | rabbitmq-server-git-f27b0455a9468b304f61865eb5947ef30f050695.tar.gz | |
fixed some more bugs
| -rw-r--r-- | src/rabbit_queue_index.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl index 0ec0cd3dc5..6b075a17d0 100644 --- a/src/rabbit_queue_index.erl +++ b/src/rabbit_queue_index.erl @@ -154,7 +154,8 @@ write_acks(SeqIds, State = #qistate { journal_handle = JournalHdl, State1 = State #qistate { journal_ack_dict = JAckDict1, journal_ack_count = JAckCount1 }, case JAckCount1 > ?MAX_ACK_JOURNAL_ENTRY_COUNT of - true -> flush_journal(State1); + true -> {_Cont, State2} = flush_journal(State1), + State2; false -> State1 end. @@ -177,7 +178,7 @@ flush_journal(State = #qistate { journal_handle = JournalHdl, if JAckCount1 == 0 -> {ok, 0} = file:position(JournalHdl, 0), - file:truncate(JournalHdl), + ok = file:truncate(JournalHdl), {false, State2}; JAckCount1 > ?MAX_ACK_JOURNAL_ENTRY_COUNT -> flush_journal(State2); @@ -203,7 +204,8 @@ read_segment_entries(InitSeqId, State = #qistate { dir = Dir }) -> %% Minor Helpers %%---------------------------------------------------------------------------- -close_file_handle_for_seg(undefined, State) -> +close_file_handle_for_seg(_SegNum, + State = #qistate { cur_seg_num = undefined }) -> State; close_file_handle_for_seg(SegNum, State = #qistate { cur_seg_num = SegNum, cur_seg_hdl = Hdl }) -> |