diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-17 17:05:00 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-17 17:05:00 +0100 |
| commit | fab0e02038ffd9b876eaef2c37328875385e1c9d (patch) | |
| tree | 88e8bfcea51007bce5fc5b69fe98de9eeb8f0446 /src/rabbit.erl | |
| parent | f246890fdc2e2de4e620c5938a0cc55a399e46ac (diff) | |
| download | rabbitmq-server-git-fab0e02038ffd9b876eaef2c37328875385e1c9d.tar.gz | |
refactor
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 26d13288da..1b5026cc04 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -245,14 +245,12 @@ environment() -> rotate_logs(BinarySuffix) -> Suffix = binary_to_list(BinarySuffix), - R = log_rotation_result(rotate_logs(log_location(kernel), + 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)), - io:format("Rot Handlers: ~p~n", [gen_event:which_handlers(error_logger)]), - R. + rabbit_sasl_report_file_h)). %%-------------------------------------------------------------------- @@ -449,19 +447,21 @@ ensure_working_log_handlers() -> error_logger_tty_h, log_location(kernel), Handlers), + ok = ensure_working_log_handler(sasl_report_file_h, rabbit_sasl_report_file_h, sasl_report_tty_h, log_location(sasl), Handlers), case log_location(kernel) of - tty -> ok; - _ -> error_logger:delete_report_handler(error_logger_tty_h) + tty -> ok; + undefined -> ok; + _ -> error_logger:delete_report_handler(error_logger_tty_h) end, ok. -ensure_working_log_handler(OldFHandler, 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 |