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 /src/rabbit.erl | |
| 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.
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 13 |
1 files changed, 5 insertions, 8 deletions
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, |