diff options
| -rw-r--r-- | scripts/rabbitmq-server.bat | 9 | ||||
| -rw-r--r-- | src/rabbit.erl | 16 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 1 |
3 files changed, 8 insertions, 18 deletions
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index aec323dafc..3049f22d23 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -70,18 +70,9 @@ if "!RABBITMQ_LOG_BASE!"=="" ( rem We save the previous logs in their respective backup
rem Log management (rotation, filtering based of size...) is left as an exercice for the user.
-set BACKUP_EXTENSION=.1
-
set LOGS=!RABBITMQ_LOG_BASE!\!RABBITMQ_NODENAME!.log
set SASL_LOGS=!RABBITMQ_LOG_BASE!\!RABBITMQ_NODENAME!-sasl.log
-if exist "!LOGS!" (
- type "!LOGS!" >> "!LOGS!!BACKUP_EXTENSION!"
-)
-if exist "!SASL_LOGS!" (
- type "!SASL_LOGS!" >> "!SASL_LOGS!!BACKUP_EXTENSION!"
-)
-
rem End of log management
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 diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 275aca8319..ddd7f16f49 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -860,7 +860,6 @@ test_log_management_during_startup() -> TmpLog = "/tmp/rabbit-tests/test.log", delete_file(TmpLog), ok = application:set_env(rabbit, error_logger, {file, TmpLog}), - ok = application:set_env(sasl, error_logger, {file, TmpLog}), ok = delete_log_handlers([rabbit_error_logger_file_h]), ok = add_log_handlers([{error_logger_file_h, MainLog}]), |