diff options
| -rwxr-xr-x | scripts/rabbitmq-server | 1 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 1 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 1 | ||||
| -rw-r--r-- | src/rabbit.erl | 7 | ||||
| -rw-r--r-- | src/rabbit_error_logger_file_h.erl | 3 |
5 files changed, 4 insertions, 9 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index deca5b3042..937746fc51 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -106,7 +106,6 @@ exec erl \ ${RABBITMQ_SERVER_ERL_ARGS} \ ${RABBITMQ_LISTEN_ARG} \ -sasl errlog_type error \ - -sasl sasl_error_logger false \ -rabbit error_logger '{file,"'${RABBITMQ_LOGS}'"}' \ -rabbit sasl_error_logger '{file,"'${RABBITMQ_SASL_LOGS}'"}' \ -os_mon start_cpu_sup true \ diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 3049f22d23..20db55ee3e 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -135,7 +135,6 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" ( -rabbit error_logger {file,\""!LOGS:\=/!"\"} ^
!RABBITMQ_SERVER_ERL_ARGS! ^
-sasl errlog_type error ^
--sasl sasl_error_logger false ^
-rabbit sasl_error_logger {file,\""!SASL_LOGS:\=/!"\"} ^
-os_mon start_cpu_sup true ^
-os_mon start_disksup false ^
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 62d1e4aa36..8d1984edcf 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -200,7 +200,6 @@ set ERLANG_SERVICE_ARGUMENTS= ^ -rabbit error_logger {file,\""!LOGS:\=/!"\"} ^
!RABBITMQ_SERVER_ERL_ARGS! ^
-sasl errlog_type error ^
--sasl sasl_error_logger false ^
-rabbit sasl_error_logger {file,\""!SASL_LOGS:\=/!"\"} ^
-os_mon start_cpu_sup true ^
-os_mon start_disksup false ^
diff --git a/src/rabbit.erl b/src/rabbit.erl index fa8e169340..daa9aa2555 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -453,7 +453,7 @@ insert_default_data() -> ensure_working_log_handlers() -> Handlers = gen_event:which_handlers(error_logger), - ok = ensure_working_log_handler(error_logger_file_h, + ok = ensure_working_log_handler(error_logger_tty_h, rabbit_error_logger_file_h, error_logger_tty_h, log_location(kernel), @@ -464,11 +464,6 @@ ensure_working_log_handlers() -> sasl_report_tty_h, log_location(sasl), Handlers), - case log_location(kernel) of - tty -> ok; - undefined -> ok; - _ -> error_logger:delete_report_handler(error_logger_tty_h) - end, ok. ensure_working_log_handler(OldFHandler, NewFHandler, TTYHandler, diff --git a/src/rabbit_error_logger_file_h.erl b/src/rabbit_error_logger_file_h.erl index 519aac10ad..1aca0827fb 100644 --- a/src/rabbit_error_logger_file_h.erl +++ b/src/rabbit_error_logger_file_h.erl @@ -46,6 +46,9 @@ init({{File, _}, error}) -> %% log rotation init({File, []}) -> init(File); +%% Used only when taking over from the tty handler +init({{File, []}, _}) -> + init(File); init({File, {error_logger, []}}) -> rabbit_misc:ensure_parent_dirs_exist(File), init_file(File, error_logger); |