diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-09-23 15:23:16 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-09-23 15:23:16 +0100 |
| commit | 201a9d85e0d434f19de946625c9036e81d7f8d24 (patch) | |
| tree | 7452f91b947c503e9836e45c491803be8eabdca5 /src | |
| parent | b50bd5a58457eeaf0ea9b24b12c9607912018013 (diff) | |
| download | rabbitmq-server-git-201a9d85e0d434f19de946625c9036e81d7f8d24.tar.gz | |
inverting previous changeset...
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_msg_store.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index c29ecddbc4..9bafe6592a 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -271,7 +271,8 @@ init(Dir, FileSizeLimit, ReadFileHandlesLimit, build_index(Files, State), %% read is only needed so that we can seek - {ok, FileHdl} = open_file(Dir, CurFile, ?WRITE_MODE ++ [read]), + {ok, FileHdl} = open_file(Dir, filenum_to_name(CurFile), + ?WRITE_MODE ++ [read]), {ok, Offset} = file:position(FileHdl, Offset), State1 #msstate { current_file_handle = FileHdl }. @@ -424,8 +425,6 @@ filenum_to_name(File) -> integer_to_list(File) ++ ?FILE_EXTENSION. filename_to_num(FileName) -> list_to_integer(filename:rootname(FileName)). -open_file(Dir, FileNum, Mode) when is_integer(FileNum) -> - open_file(Dir, filenum_to_name(FileNum), Mode); open_file(Dir, FileName, Mode) -> file:open(form_filename(Dir, FileName), ?BINARY_MODE ++ Mode). @@ -775,7 +774,7 @@ maybe_roll_to_new_file(Offset, State1 = sync(State), ok = file:close(CurHdl), NextFile = CurFile + 1, - {ok, NextHdl} = open_file(Dir, NextFile, ?WRITE_MODE), + {ok, NextHdl} = open_file(Dir, filenum_to_name(NextFile), ?WRITE_MODE), true = ets:update_element(FileSummary, CurFile, {#file_summary.right, NextFile}), true = ets:insert_new( |