diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-12 17:49:23 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-12 17:49:23 +0100 |
| commit | 59d0dcc5d511570a066ec823b2c1fdbed04e808e (patch) | |
| tree | 015dc462c2855fa6ba8af1896f9d1ecfd9d1f72c | |
| parent | ac7a3a8cdfeedd541dc222b486b94db5c06773d4 (diff) | |
| download | rabbitmq-server-git-59d0dcc5d511570a066ec823b2c1fdbed04e808e.tar.gz | |
remove old log files when rotating
| -rw-r--r-- | src/rabbit.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_error_logger_file_h.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 6 |
3 files changed, 3 insertions, 8 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index e45968a8c5..a537ce7502 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -464,7 +464,7 @@ ensure_working_log_handler(NewFHandler, TTYHandler, LogLocation, Handlers) -> _ -> case lists:member(NewFHandler, Handlers) of true -> ok; false -> case rotate_logs(LogLocation, "", - undefined, NewFHandler) of + NewFHandler) of ok -> ok; {error, Reason} -> throw({error, {cannot_log_to_file, diff --git a/src/rabbit_error_logger_file_h.erl b/src/rabbit_error_logger_file_h.erl index dacd0de4e0..fbc1c6abb0 100644 --- a/src/rabbit_error_logger_file_h.erl +++ b/src/rabbit_error_logger_file_h.erl @@ -30,7 +30,8 @@ %% Used only when swapping handlers in log rotation init({{File, Suffix}, []}) -> case rabbit_misc:append_file(File, Suffix) of - ok -> ok; + ok -> file:delete(File), + ok; {error, Error} -> rabbit_log:error("Failed to append contents of " "log file '~s' to '~s':~n~p~n", diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index ed4efb4710..5d4aa9d84e 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -796,12 +796,6 @@ test_log_management() -> ok = control_action(rotate_logs, [Suffix]), [true, true] = empty_files([[MainLog, Suffix], [SaslLog, Suffix]]), - %% original main log file is not writable - ok = make_files_non_writable([MainLog]), - {error, {cannot_rotate_main_logs, _}} = control_action(rotate_logs, []), - ok = clean_logs([MainLog], Suffix), - ok = add_log_handlers([{rabbit_error_logger_file_h, MainLog}]), - %% original sasl log file is not writable ok = make_files_non_writable([SaslLog]), {error, {cannot_rotate_sasl_logs, _}} = control_action(rotate_logs, []), |