From bfe8a57bb9356415e6438f0deb410b03a7c602d1 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Wed, 9 May 2018 17:22:43 +0200
Subject: Remove logger env vars for format_depth, max_size and utc

These are replaced by new config handling and must not be used any
more.
---
 lib/kernel/src/logger_formatter.erl | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

(limited to 'lib/kernel/src/logger_formatter.erl')

diff --git a/lib/kernel/src/logger_formatter.erl b/lib/kernel/src/logger_formatter.erl
index 8e954f8d98..624f523465 100644
--- a/lib/kernel/src/logger_formatter.erl
+++ b/lib/kernel/src/logger_formatter.erl
@@ -259,17 +259,17 @@ month(12) -> "Dec".
 utcstr(#{utc:=true}) -> "UTC ";
 utcstr(_) -> "".
 
-add_default_config(#{utc:=_}=Config0) ->
+add_default_config(Config0) ->
     Default =
         #{legacy_header=>false,
           single_line=>true,
           chars_limit=>unlimited},
     MaxSize = get_max_size(maps:get(max_size,Config0,false)),
     Depth = get_depth(maps:get(depth,Config0,false)),
+    Utc = get_utc(maps:get(utc,Config0,false)),
     add_default_template(maps:merge(Default,Config0#{max_size=>MaxSize,
-                                                     depth=>Depth}));
-add_default_config(Config) ->
-    add_default_config(Config#{utc=>logger:get_utc_config()}).
+                                                     depth=>Depth,
+                                                     utc=>Utc})).
 
 add_default_template(#{template:=_}=Config) ->
     Config;
@@ -284,11 +284,28 @@ default_template(_) ->
     ?DEFAULT_FORMAT_TEMPLATE.
 
 get_max_size(false) ->
-    logger:get_max_size();
+    unlimited;
 get_max_size(S) ->
     max(10,S).
 
 get_depth(false) ->
-    logger:get_format_depth();
+    error_logger:get_format_depth();
 get_depth(S) ->
     max(5,S).
+
+get_utc(false) ->
+    get_utc_config();
+get_utc(U) ->
+    U.
+
+get_utc_config() ->
+    %% SASL utc_log overrides stdlib config - in order to have uniform
+    %% timestamps in log messages
+    case application:get_env(sasl, utc_log) of
+        {ok, Val} -> Val;
+        undefined ->
+            case application:get_env(stdlib, utc_log) of
+                {ok, Val} -> Val;
+                undefined -> false
+            end
+    end.
-- 
cgit v1.2.3