diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2017-08-18 11:14:56 +0100 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2017-08-18 11:14:56 +0100 |
| commit | 0c6255e368ffb6000d403568c0ed0f6d125d25b0 (patch) | |
| tree | 6b66a89e7fc8bd872badbe2ccae7dbb6c7d0e1dd /test | |
| parent | 8034de0125e56ce575c1e8a93cff164bcd33f96e (diff) | |
| download | rabbitmq-server-git-0c6255e368ffb6000d403568c0ed0f6d125d25b0.tar.gz | |
Refactor log configuration to be consistent with log doc guide
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit_inbroker_non_parallel_SUITE.erl | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/test/unit_inbroker_non_parallel_SUITE.erl b/test/unit_inbroker_non_parallel_SUITE.erl index 2af6368f34..9c7d798ecc 100644 --- a/test/unit_inbroker_non_parallel_SUITE.erl +++ b/test/unit_inbroker_non_parallel_SUITE.erl @@ -238,18 +238,20 @@ log_management1(_Config) -> %% logging directed to tty (first, remove handlers) ok = rabbit:stop(), ok = clean_logs([LogFile], Suffix), - ok = application:set_env(rabbit, lager_handler, tty), + ok = application:set_env(rabbit, lager_default_file, tty), + application:unset_env(rabbit, log), application:unset_env(lager, handlers), application:unset_env(lager, extra_sinks), ok = rabbit:start(), timer:sleep(200), rabbit_log:info("test info"), - [{error, enoent}] = empty_files([LogFile]), + [{error, enoent}] = non_empty_files([LogFile]), %% rotate logs when logging is turned off ok = rabbit:stop(), ok = clean_logs([LogFile], Suffix), - ok = application:set_env(rabbit, lager_handler, false), + ok = application:set_env(rabbit, lager_default_file, false), + application:unset_env(rabbit, log), application:unset_env(lager, handlers), application:unset_env(lager, extra_sinks), ok = rabbit:start(), @@ -261,7 +263,8 @@ log_management1(_Config) -> %% cleanup ok = rabbit:stop(), ok = clean_logs([LogFile], Suffix), - ok = application:set_env(rabbit, lager_handler, LogFile), + ok = application:set_env(rabbit, lager_default_file, LogFile), + application:unset_env(rabbit, log), application:unset_env(lager, handlers), application:unset_env(lager, extra_sinks), ok = rabbit:start(), @@ -279,7 +282,8 @@ log_management_during_startup1(_Config) -> %% start application with simple tty logging ok = rabbit:stop(), ok = clean_logs([LogFile], Suffix), - ok = application:set_env(rabbit, lager_handler, tty), + ok = application:set_env(rabbit, lager_default_file, tty), + application:unset_env(rabbit, log), application:unset_env(lager, handlers), application:unset_env(lager, extra_sinks), ok = rabbit:start(), @@ -289,7 +293,8 @@ log_management_during_startup1(_Config) -> delete_file(NonExistent), delete_file(filename:dirname(NonExistent)), ok = rabbit:stop(), - ok = application:set_env(rabbit, lager_handler, NonExistent), + ok = application:set_env(rabbit, lager_default_file, NonExistent), + application:unset_env(rabbit, log), application:unset_env(lager, handlers), application:unset_env(lager, extra_sinks), ok = rabbit:start(), @@ -301,7 +306,8 @@ log_management_during_startup1(_Config) -> delete_file(NoPermission1), delete_file(filename:dirname(NoPermission1)), ok = rabbit:stop(), - ok = application:set_env(rabbit, lager_handler, NoPermission1), + ok = application:set_env(rabbit, lager_default_file, NoPermission1), + application:unset_env(rabbit, log), application:unset_env(lager, handlers), application:unset_env(lager, extra_sinks), ok = try rabbit:start() of @@ -326,7 +332,8 @@ log_management_during_startup1(_Config) -> ok -> ok; {error, lager_not_running} -> ok end, - ok = application:set_env(rabbit, lager_handler, NoPermission2), + ok = application:set_env(rabbit, lager_default_file, NoPermission2), + application:unset_env(rabbit, log), application:unset_env(lager, handlers), application:unset_env(lager, extra_sinks), ok = try rabbit:start() of @@ -343,7 +350,8 @@ log_management_during_startup1(_Config) -> end, %% cleanup - ok = application:set_env(rabbit, lager_handler, LogFile), + ok = application:set_env(rabbit, lager_default_file, LogFile), + application:unset_env(rabbit, log), application:unset_env(lager, handlers), application:unset_env(lager, extra_sinks), ok = rabbit:start(), |