diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-12 16:59:28 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-12 16:59:28 +0100 |
| commit | ac7a3a8cdfeedd541dc222b486b94db5c06773d4 (patch) | |
| tree | 34780a31d008575c133ef5610b1fc4c66ed03c30 | |
| parent | 5ff902b4d2118d5d451d976c7287f27f0d4c65da (diff) | |
| download | rabbitmq-server-git-ac7a3a8cdfeedd541dc222b486b94db5c06773d4.tar.gz | |
don't bother swapping out non-existing loggers
Error logging seems to work fine even when stopping/starting rabbit.
Also, remove the tty_logger last in case we need it before.
Since ensure_working_log_handlers/0 is the first executed by rabbit,
we can be fairly certain we won't miss any log events.
| -rw-r--r-- | scripts/rabbitmq-server.bat | 4 | ||||
| -rw-r--r-- | src/rabbit.erl | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 5e2097dbe9..a7c9c973b4 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -141,10 +141,10 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" ( +P 1048576 ^
-kernel inet_default_connect_options "[{nodelay, true}]" ^
!RABBITMQ_LISTEN_ARG! ^
--kernel error_logger {file,\""!LOGS:\=/!"\"} ^
+-rabbit error_logger {file,\""!LOGS:\=/!"\"} ^
!RABBITMQ_SERVER_ERL_ARGS! ^
-sasl errlog_type error ^
--sasl sasl_error_logger {file,\""!SASL_LOGS:\=/!"\"} ^
+-rabbit sasl_error_logger {file,\""!SASL_LOGS:\=/!"\"} ^
-os_mon start_cpu_sup true ^
-os_mon start_disksup false ^
-os_mon start_memsup false ^
diff --git a/src/rabbit.erl b/src/rabbit.erl index c855a806eb..e45968a8c5 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -441,21 +441,18 @@ insert_default_data() -> ensure_working_log_handlers() -> Handlers = gen_event:which_handlers(error_logger), - ok = ensure_working_log_handler(error_logger_file_h, - rabbit_error_logger_file_h, + ok = ensure_working_log_handler(rabbit_error_logger_file_h, error_logger_tty_h, log_location(kernel), Handlers), - error_logger:delete_report_handler(error_logger_tty_h), - ok = ensure_working_log_handler(sasl_report_file_h, - rabbit_sasl_report_file_h, + ok = ensure_working_log_handler(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(OldFHandler, NewFHandler, TTYHandler, - LogLocation, Handlers) -> +ensure_working_log_handler(NewFHandler, TTYHandler, LogLocation, Handlers) -> case LogLocation of undefined -> ok; tty -> case lists:member(TTYHandler, Handlers) of @@ -467,7 +464,7 @@ ensure_working_log_handler(OldFHandler, NewFHandler, TTYHandler, _ -> case lists:member(NewFHandler, Handlers) of true -> ok; false -> case rotate_logs(LogLocation, "", - OldFHandler, NewFHandler) of + undefined, NewFHandler) of ok -> ok; {error, Reason} -> throw({error, {cannot_log_to_file, |