diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-15 15:44:39 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-15 15:44:39 +0100 |
| commit | 188f11f2ea0104fee15456c1c5bd49004e59b94e (patch) | |
| tree | ca33ec525dc840fbef37c45f1295ed05083679ed /src/rabbit.erl | |
| parent | 43b70982f3b9916871ff2bf1f0a45e9b24691703 (diff) | |
| download | rabbitmq-server-git-188f11f2ea0104fee15456c1c5bd49004e59b94e.tar.gz | |
closer to passing the tests
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index a537ce7502..a4b01695d6 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -244,12 +244,14 @@ environment() -> rotate_logs(BinarySuffix) -> Suffix = binary_to_list(BinarySuffix), - log_rotation_result(rotate_logs(log_location(kernel), + R = log_rotation_result(rotate_logs(log_location(kernel), Suffix, rabbit_error_logger_file_h), rotate_logs(log_location(sasl), Suffix, - rabbit_sasl_report_file_h)). + rabbit_sasl_report_file_h)), + io:format("Rot Handlers: ~p~n", [gen_event:which_handlers(error_logger)]), + R. %%-------------------------------------------------------------------- @@ -441,18 +443,21 @@ insert_default_data() -> ensure_working_log_handlers() -> Handlers = gen_event:which_handlers(error_logger), - ok = ensure_working_log_handler(rabbit_error_logger_file_h, + ok = ensure_working_log_handler(error_logger_file_h, + rabbit_error_logger_file_h, error_logger_tty_h, log_location(kernel), Handlers), - ok = ensure_working_log_handler(rabbit_sasl_report_file_h, + ok = ensure_working_log_handler(sasl_report_file_h, + rabbit_sasl_report_file_h, sasl_report_tty_h, log_location(sasl), Handlers), error_logger:delete_report_handler(error_logger_tty_h), ok. -ensure_working_log_handler(NewFHandler, TTYHandler, LogLocation, Handlers) -> +ensure_working_log_handler(OldFHandler, NewFHandler, TTYHandler, LogLocation, + Handlers) -> case LogLocation of undefined -> ok; tty -> case lists:member(TTYHandler, Handlers) of @@ -464,7 +469,7 @@ ensure_working_log_handler(NewFHandler, TTYHandler, LogLocation, Handlers) -> _ -> case lists:member(NewFHandler, Handlers) of true -> ok; false -> case rotate_logs(LogLocation, "", - NewFHandler) of + OldFHandler, NewFHandler) of ok -> ok; {error, Reason} -> throw({error, {cannot_log_to_file, |