diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-09-15 16:15:12 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-09-15 16:15:12 +0100 |
| commit | 38d108f164be01c93d6584df5d2a8e42b675d46f (patch) | |
| tree | 9d36b116aa577959ac9922de781ce84ba657254c /src/rabbit.erl | |
| parent | 4688cadd6a09f33bdd9414a1dd41659d424ef22f (diff) | |
| download | rabbitmq-server-git-38d108f164be01c93d6584df5d2a8e42b675d46f.tar.gz | |
cosmetic and comments
Also, explicitly disable the SASL logger at start-up. Otherwise, I think it
gets started on the first event (it starts up after ensure_log_handlers/0, but
before rabbit starts up completely).
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index f09556a423..dbd31a5910 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -467,14 +467,14 @@ ensure_working_log_handlers() -> log_location(kernel), Handlers), - ok = ensure_working_log_handler(sasl_report_file_h, + ok = ensure_working_log_handler(sasl_report_tty_h, rabbit_sasl_report_file_h, sasl_report_tty_h, log_location(sasl), Handlers), ok. -ensure_working_log_handler(OldFHandler, NewFHandler, TTYHandler, +ensure_working_log_handler(OldHandler, NewHandler, TTYHandler, LogLocation, Handlers) -> case LogLocation of undefined -> ok; @@ -484,10 +484,10 @@ ensure_working_log_handler(OldFHandler, NewFHandler, TTYHandler, throw({error, {cannot_log_to_tty, TTYHandler, not_installed}}) end; - _ -> case lists:member(NewFHandler, Handlers) of + _ -> case lists:member(NewHandler, Handlers) of true -> ok; false -> case rotate_logs(LogLocation, "", - OldFHandler, NewFHandler) of + OldHandler, NewHandler) of ok -> ok; {error, Reason} -> throw({error, {cannot_log_to_file, |