diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-11-25 15:37:12 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-11-25 15:37:12 +0000 |
| commit | 2584df47dba4b4e1e4d5cba0968095d589aea3d5 (patch) | |
| tree | 11b1462c112ffd4b52cb63b41ced934fa1fb37a4 | |
| parent | b0c2cac6b7d7b3efb9df6d39dfaba5ca7b90fc1b (diff) | |
| download | rabbitmq-server-git-2584df47dba4b4e1e4d5cba0968095d589aea3d5.tar.gz | |
cosmetic
| -rw-r--r-- | src/rabbit_queue_index.erl | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl index 43dbf9d4cb..2857eac4c3 100644 --- a/src/rabbit_queue_index.erl +++ b/src/rabbit_queue_index.erl @@ -1040,29 +1040,25 @@ transform_queue(Dir, Gatherer, {JournalFun, SegmentFun}) -> transform_file(Path, Fun) -> PathTmp = Path ++ ".upgrade", case filelib:file_size(Path) of - 0 -> - ok; - Size -> - {ok, PathTmpHdl} = - file_handle_cache:open(PathTmp, ?WRITE_MODE, - [{write_buffer, infinity}]), + 0 -> ok; + Size -> {ok, PathTmpHdl} = + file_handle_cache:open(PathTmp, ?WRITE_MODE, + [{write_buffer, infinity}]), - {ok, PathHdl} = file_handle_cache:open( - Path, [{read_ahead, Size} | ?READ_MODE], []), - {ok, Content} = file_handle_cache:read(PathHdl, Size), - ok = file_handle_cache:close(PathHdl), + {ok, PathHdl} = file_handle_cache:open( + Path, [{read_ahead, Size} | ?READ_MODE], []), + {ok, Content} = file_handle_cache:read(PathHdl, Size), + ok = file_handle_cache:close(PathHdl), - ok = drive_transform_fun(Fun, PathTmpHdl, Content), + ok = drive_transform_fun(Fun, PathTmpHdl, Content), - ok = file_handle_cache:close(PathTmpHdl), - ok = file:rename(PathTmp, Path) + ok = file_handle_cache:close(PathTmpHdl), + ok = file:rename(PathTmp, Path) end. drive_transform_fun(Fun, Hdl, Contents) -> case Fun(Contents) of - stop -> - ok; - {Output, Contents1} -> - ok = file_handle_cache:append(Hdl, Output), - drive_transform_fun(Fun, Hdl, Contents1) + stop -> ok; + {Output, Contents1} -> ok = file_handle_cache:append(Hdl, Output), + drive_transform_fun(Fun, Hdl, Contents1) end. |