root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

As of Lager 3.8.2, Lager has a log_root default 

so override it unconditionally.
This commit is contained in:
Michael Klishin 2021-02-25 00:42:16 +03:00
parent 046db4be92
commit cd1a271499
No known key found for this signature in database
GPG Key ID: E80EDCFA0CDB21EE
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
deps/rabbit/src/rabbit_lager.erl vendored
View File

@ -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 ->

3
deps/rabbit/test/unit_log_config_SUITE.erl vendored
View File

@ -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))),