diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2021-02-25 00:42:16 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2021-02-25 00:43:02 +0300 |
| commit | cd1a271499e0cb336bb1551e4e16e3f69d8db96d (patch) | |
| tree | 5496f0ddd1bcc01a01ff7c8f11c23020bba1bda2 | |
| parent | 046db4be92c6789affcc168512a5b053259eaa32 (diff) | |
| download | rabbitmq-server-git-cd1a271499e0cb336bb1551e4e16e3f69d8db96d.tar.gz | |
As of Lager 3.8.2, Lager has a log_root default
so override it unconditionally.
| -rw-r--r-- | deps/rabbit/src/rabbit_lager.erl | 20 | ||||
| -rw-r--r-- | deps/rabbit/test/unit_log_config_SUITE.erl | 3 |
2 files changed, 10 insertions, 13 deletions
diff --git a/deps/rabbit/src/rabbit_lager.erl b/deps/rabbit/src/rabbit_lager.erl index a75f477779..b49b581338 100644 --- a/deps/rabbit/src/rabbit_lager.erl +++ b/deps/rabbit/src/rabbit_lager.erl @@ -221,18 +221,14 @@ configure_lager() -> undefined -> application:set_env(lager, error_logger_format_raw, true); _ -> ok end, - case application:get_env(lager, log_root) of - undefined -> - %% Setting env var to 'undefined' is different from not - %% setting it at all, and lager is sensitive to this - %% difference. - case application:get_env(rabbit, lager_log_root) of - {ok, Value} -> - ok = application:set_env(lager, log_root, Value); - _ -> - ok - end; - _ -> ok + %% Setting env var to 'undefined' is different from not + %% setting it at all, and lager is sensitive to this + %% difference. + case application:get_env(rabbit, lager_log_root) of + {ok, Value} -> + ok = application:set_env(lager, log_root, Value); + _ -> + ok end, case application:get_env(lager, colored) of undefined -> diff --git a/deps/rabbit/test/unit_log_config_SUITE.erl b/deps/rabbit/test/unit_log_config_SUITE.erl index 9728a7ff8d..5c67f3cf2f 100644 --- a/deps/rabbit/test/unit_log_config_SUITE.erl +++ b/deps/rabbit/test/unit_log_config_SUITE.erl @@ -640,10 +640,11 @@ default(_) -> LogUpgradeFile = "rabbit_default_upgrade.log", application:set_env(rabbit, lager_upgrade_file, LogUpgradeFile), + ?assertEqual(LogRoot, application:get_env(rabbit, lager_log_root, undefined)), rabbit_lager:configure_lager(), ExpectedHandlers = default_expected_handlers(LogFile), - LogRoot = application:get_env(lager, log_root, undefined), + ?assertEqual(LogRoot, application:get_env(lager, log_root, undefined)), ?assertEqual(ExpectedHandlers, sort_handlers(application:get_env(lager, handlers, undefined))), ?assertEqual(ExpectedHandlers, sort_handlers(application:get_env(lager, rabbit_handlers, undefined))), |