diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 1b5026cc04..e5239882fa 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -484,9 +484,9 @@ ensure_working_log_handler(OldFHandler, NewFHandler, TTYHandler, log_location(Type) -> case application:get_env(rabbit, case Type of - kernel -> error_logger; - sasl -> sasl_error_logger - end) of + kernel -> error_logger; + sasl -> sasl_error_logger + end) of {ok, {file, File}} -> File; {ok, false} -> undefined; {ok, tty} -> tty; diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index ddd7f16f49..d885b094c5 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -853,7 +853,6 @@ test_log_management_during_startup() -> end, %% fix sasl logging - ok = application:unset_env(sasl, sasl_error_logger), ok = application:set_env(rabbit, sasl_error_logger, {file, SaslLog}), %% start application with logging to non-existing directory @@ -863,7 +862,6 @@ test_log_management_during_startup() -> ok = delete_log_handlers([rabbit_error_logger_file_h]), ok = add_log_handlers([{error_logger_file_h, MainLog}]), - ok = control_action(start_app, []), %% start application with logging to directory with no @@ -896,7 +894,6 @@ test_log_management_during_startup() -> %% start application with standard error_logger_file_h %% handler not installed - ok = application:unset_env(kernel, error_logger), ok = application:set_env(rabbit, error_logger, {file, MainLog}), ok = control_action(start_app, []), ok = control_action(stop_app, []), |