diff options
author | Emile Joubert <emile@rabbitmq.com> | 2012-06-18 11:15:42 +0100 |
---|---|---|
committer | Emile Joubert <emile@rabbitmq.com> | 2012-06-18 11:15:42 +0100 |
commit | 269607e566c743c9e7a701a26e7ed58c252c824b (patch) | |
tree | 403a92d0c48dadad1a2d72b4416c243c02c25370 | |
parent | 0b89fc81ac1e40d5beeb5e2b873ee744e736ea51 (diff) | |
download | rabbitmq-server-269607e566c743c9e7a701a26e7ed58c252c824b.tar.gz |
Only one version of append_file is required
-rw-r--r-- | src/rabbit_error_logger_file_h.erl | 2 | ||||
-rw-r--r-- | src/rabbit_file.erl | 28 | ||||
-rw-r--r-- | src/rabbit_sasl_report_file_h.erl | 2 |
3 files changed, 4 insertions, 28 deletions
diff --git a/src/rabbit_error_logger_file_h.erl b/src/rabbit_error_logger_file_h.erl index aa47ed61..042ab23c 100644 --- a/src/rabbit_error_logger_file_h.erl +++ b/src/rabbit_error_logger_file_h.erl @@ -33,7 +33,7 @@ %% Used only when swapping handlers in log rotation init({{File, Suffix}, []}) -> - case rabbit_file:append_file_using_copy(File, Suffix) of + case rabbit_file:append_file(File, Suffix) of ok -> file:delete(File), ok; {error, Error} -> diff --git a/src/rabbit_file.erl b/src/rabbit_file.erl index d8955dee..74c65106 100644 --- a/src/rabbit_file.erl +++ b/src/rabbit_file.erl @@ -20,7 +20,7 @@ -export([is_file/1, is_dir/1, file_size/1, ensure_dir/1, wildcard/2, list_dir/1]). -export([read_term_file/1, write_term_file/2, write_file/2, write_file/3]). --export([append_file_using_copy/2, append_file/2, ensure_parent_dirs_exist/1]). +-export([append_file/2, ensure_parent_dirs_exist/1]). -export([rename/2, delete/1, recursive_delete/1, recursive_copy/2]). -export([lock_file/1]). @@ -42,7 +42,6 @@ -spec(write_term_file/2 :: (file:filename(), [any()]) -> ok_or_error()). -spec(write_file/2 :: (file:filename(), iodata()) -> ok_or_error()). -spec(write_file/3 :: (file:filename(), iodata(), [any()]) -> ok_or_error()). --spec(append_file_using_copy/2 :: (file:filename(), string()) -> ok_or_error()). -spec(append_file/2 :: (file:filename(), string()) -> ok_or_error()). -spec(ensure_parent_dirs_exist/1 :: (string()) -> 'ok'). -spec(rename/2 :: @@ -169,8 +168,7 @@ make_binary(List) -> {error, Reason} end. -%% this version will not read the entire file into memory first -append_file_using_copy(File, Suffix) -> +append_file(File, Suffix) -> case with_fhc_handle(2, fun () -> file:copy(File, {[File, Suffix], [append]}) end) of @@ -178,28 +176,6 @@ append_file_using_copy(File, Suffix) -> Error -> Error end. -append_file(File, Suffix) -> - case read_file_info(File) of - {ok, FInfo} -> append_file(File, FInfo#file_info.size, Suffix); - {error, enoent} -> append_file(File, 0, Suffix); - Error -> Error - end. - -append_file(_, _, "") -> - ok; -append_file(File, 0, Suffix) -> - with_fhc_handle(fun () -> - case prim_file:open([File, Suffix], [append]) of - {ok, Fd} -> prim_file:close(Fd); - Error -> Error - end - end); -append_file(File, _, Suffix) -> - case with_fhc_handle(fun () -> prim_file:read_file(File) end) of - {ok, Data} -> write_file([File, Suffix], Data, [append]); - Error -> Error - end. - ensure_parent_dirs_exist(Filename) -> case ensure_dir(Filename) of ok -> ok; diff --git a/src/rabbit_sasl_report_file_h.erl b/src/rabbit_sasl_report_file_h.erl index 5f4080e9..e8beecfe 100644 --- a/src/rabbit_sasl_report_file_h.erl +++ b/src/rabbit_sasl_report_file_h.erl @@ -34,7 +34,7 @@ %% Used only when swapping handlers and performing %% log rotation init({{File, Suffix}, []}) -> - case rabbit_file:append_file_using_copy(File, Suffix) of + case rabbit_file:append_file(File, Suffix) of ok -> file:delete(File), ok; {error, Error} -> |