summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2017-03-24 17:21:50 +0300
committerMichael Klishin <mklishin@pivotal.io>2017-03-24 17:21:50 +0300
commit5cf4889af65471ff7e4910d3730d469da108458d (patch)
tree3aef6da78aeac4fee326ae7862ea05d3f8235985 /src
parent6fa3ee4ccc71ae117492968fb89e217666deea37 (diff)
parent4c553f713194caed7843f5161c3650c10e4245c5 (diff)
downloadrabbitmq-server-git-5cf4889af65471ff7e4910d3730d469da108458d.tar.gz
Merge branch 'binarin-embed-friendly-lager-init'
Diffstat (limited to 'src')
-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..cb27eda788 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, Value} ->
+ application:set_env(lager, log_root, Value);
+ _ ->
+ ok
+ end;
_ -> ok
end,