diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-17 16:44:01 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-08-17 16:44:01 +0100 |
| commit | dc879dea9055ec357c808de1622a504d85b9b0ef (patch) | |
| tree | 306677955a5e0f444b9a6af367fd4eeef4b6b1a6 | |
| parent | 188f11f2ea0104fee15456c1c5bd49004e59b94e (diff) | |
| download | rabbitmq-server-git-dc879dea9055ec357c808de1622a504d85b9b0ef.tar.gz | |
tests pass
| -rw-r--r-- | src/rabbit.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index a4b01695d6..5367c6fbb2 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -453,7 +453,10 @@ ensure_working_log_handlers() -> sasl_report_tty_h, log_location(sasl), Handlers), - error_logger:delete_report_handler(error_logger_tty_h), + case log_location(kernel) of + tty -> ok; + _ -> error_logger:delete_report_handler(error_logger_tty_h) + end, ok. ensure_working_log_handler(OldFHandler, NewFHandler, TTYHandler, LogLocation, diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index f4929c24af..39a2522e37 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -854,10 +854,12 @@ test_log_management_during_startup() -> %% start application with logging to non-existing directory TmpLog = "/tmp/rabbit-tests/test.log", delete_file(TmpLog), - ok = application:set_env(kernel, error_logger, {file, TmpLog}), + ok = application:set_env(rabbit, error_logger, {file, TmpLog}), + ok = application:set_env(sasl, error_logger, {file, TmpLog}), 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 @@ -875,7 +877,7 @@ test_log_management_during_startup() -> %% start application with logging to a subdirectory which %% parent directory has no write permissions TmpTestDir = "/tmp/rabbit-tests/no-permission/test/log", - ok = application:set_env(kernel, error_logger, {file, TmpTestDir}), + ok = application:set_env(rabbit, error_logger, {file, TmpTestDir}), ok = add_log_handlers([{error_logger_file_h, MainLog}]), ok = case control_action(start_app, []) of ok -> exit({got_success_but_expected_failure, |