summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/rabbit_lager.erl12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/rabbit_lager.erl b/src/rabbit_lager.erl
index c1ed613088..fdc50e8b50 100644
--- a/src/rabbit_lager.erl
+++ b/src/rabbit_lager.erl
@@ -182,9 +182,15 @@ configure_lager() ->
end,
case application:get_env(lager, log_root) of
undefined ->
- application:set_env(lager, log_root,
- application:get_env(rabbit, lager_log_root,
- 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, FromRabbitConfig} ->
+ application:set_env(lager, log_root, FromRabbitConfig);
+ _ ->
+ ok
+ end;
_ -> ok
end,