diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2020-01-16 14:22:07 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2020-02-03 10:12:49 +0100 |
| commit | 15b07b66ceba56509da843f73c8c9a151bd6d08c (patch) | |
| tree | 1d330e03f3ee5ae1b8183a59f1c2bceb10debb48 /test | |
| parent | 3be5483ec22feca1460e09aaf21b629c9c72ec3e (diff) | |
| download | rabbitmq-server-git-15b07b66ceba56509da843f73c8c9a151bd6d08c.tar.gz | |
Move all RabbitMQ-specific environment variables to `rabbit_env`
The reading of `$NOTIFY_SOCKET` is also moved at the same time. This is
in preparation of the work around start/stop status.
There is an associated commit in rabbitmq-common to update `rabbit_env`
and record the origin of each variable.
[#170149339]
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit_log_config_SUITE.erl | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/test/unit_log_config_SUITE.erl b/test/unit_log_config_SUITE.erl index ce2b7231be..ddaa18062c 100644 --- a/test/unit_log_config_SUITE.erl +++ b/test/unit_log_config_SUITE.erl @@ -56,7 +56,7 @@ init_per_testcase(_, Config) -> application:unset_env(lager, handlers), application:unset_env(lager, rabbit_handlers), application:unset_env(lager, extra_sinks), - os:unsetenv("RABBITMQ_LOGS_source"), + unset_logs_var_origin(), Config. end_per_testcase(_, Config) -> @@ -67,7 +67,7 @@ end_per_testcase(_, Config) -> application:unset_env(lager, handlers), application:unset_env(lager, rabbit_handlers), application:unset_env(lager, extra_sinks), - os:unsetenv("RABBITMQ_LOGS_source"), + unset_logs_var_origin(), application:unload(rabbit), application:unload(lager), Config. @@ -564,7 +564,7 @@ env_var_overrides_config(_) -> ConfigLogFile = "rabbit_not_default.log", application:set_env(rabbit, log, [{file, [{file, ConfigLogFile}]}]), - os:putenv("RABBITMQ_LOGS_source", "environment"), + set_logs_var_origin(environment), rabbit_lager:configure_lager(), ExpectedHandlers = default_expected_handlers(EnvLogFile), @@ -577,7 +577,7 @@ env_var_disable_log(_) -> ConfigLogFile = "rabbit_not_default.log", application:set_env(rabbit, log, [{file, [{file, ConfigLogFile}]}]), - os:putenv("RABBITMQ_LOGS_source", "environment"), + set_logs_var_origin(environment), rabbit_lager:configure_lager(), ExpectedHandlers = [], @@ -712,7 +712,7 @@ env_var_tty(_) -> application:set_env(rabbit, lager_default_file, tty), application:set_env(rabbit, lager_upgrade_file, tty), %% tty can only be set explicitly - os:putenv("RABBITMQ_LOGS_source", "environment"), + set_logs_var_origin(environment), rabbit_lager:configure_lager(), @@ -724,6 +724,15 @@ env_var_tty(_) -> ExpectedSinks = tty_expected_sinks(), ?assertEqual(ExpectedSinks, sort_sinks(application:get_env(lager, extra_sinks, undefined))). +set_logs_var_origin(Origin) -> + Context = #{var_origins => #{main_log_file => Origin}}, + rabbit_prelaunch:store_context(Context), + ok. + +unset_logs_var_origin() -> + rabbit_prelaunch:clear_context_cache(), + ok. + tty_expected_handlers() -> [{lager_console_backend, [{formatter_config, formatter_config()}, |