diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-17 16:46:11 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-17 16:46:11 +0100 |
| commit | f246890fdc2e2de4e620c5938a0cc55a399e46ac (patch) | |
| tree | 9012231b85fb089000e60f6d60ac056b254e01b5 /src/rabbit.erl | |
| parent | 2dc3eb753112511241c6cc68396351cf8851d899 (diff) | |
| parent | dc879dea9055ec357c808de1622a504d85b9b0ef (diff) | |
| download | rabbitmq-server-git-f246890fdc2e2de4e620c5938a0cc55a399e46ac.tar.gz | |
merge default into bug24332
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 8cae7fde86..26d13288da 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -245,12 +245,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. %%-------------------------------------------------------------------- @@ -447,16 +449,19 @@ 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) + 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 @@ -478,7 +483,7 @@ ensure_working_log_handler(OldFHandler, NewFHandler, TTYHandler, end. log_location(Type) -> - case application:get_env(Type, case Type of + case application:get_env(rabbit, case Type of kernel -> error_logger; sasl -> sasl_error_logger end) of |