From d35c100a10239edc669b465a2176000ffcc1300f Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Mon, 21 May 2018 16:47:46 +0200
Subject: Change Compare parameter to logger_filters:domain/2

This configuration option has been removed. logger_formatter will read
the utc_log configuration parameter and format the timestamp
accordingly.
---
 lib/sasl/src/sasl.erl | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'lib/sasl/src')

diff --git a/lib/sasl/src/sasl.erl b/lib/sasl/src/sasl.erl
index 9359bdb30e..57e0c6ca82 100644
--- a/lib/sasl/src/sasl.erl
+++ b/lib/sasl/src/sasl.erl
@@ -129,15 +129,8 @@ get_mf_maxf() ->
 add_sasl_logger(undefined, _Level) -> ok;
 add_sasl_logger(std, undefined) -> ok;
 add_sasl_logger(Dest, Level) ->
-    FC0 = #{legacy_header=>true,
-            single_line=>false,
-            template=>[{logger_formatter,header},"\n",msg,"\n"]},
-    FC = case application:get_env(sasl,utc_log) of
-             {ok,Bool} when is_boolean(Bool) ->
-                 FC0#{utc=>Bool};
-             _ ->
-                 FC0
-         end,
+    FC = #{legacy_header=>true,
+           single_line=>false},
     ok = logger:add_handler(sasl_h,logger_std_h,
                             #{level=>Level,
                               filter_default=>stop,
@@ -146,7 +139,7 @@ add_sasl_logger(Dest, Level) ->
                                     {fun logger_filters:remote_gl/2,stop}},
                                    {sasl_domain,
                                     {fun logger_filters:domain/2,
-                                     {log,equals,[beam,erlang,otp,sasl]}}}],
+                                     {log,equal,[beam,erlang,otp,sasl]}}}],
                               logger_std_h=>#{type=>Dest},
                               formatter=>{logger_formatter,FC}}).
 
-- 
cgit v1.2.3


From ca1bf7a9d915a973203aa046bb9f921c11681ee0 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Mon, 21 May 2018 16:52:23 +0200
Subject: Change handler id for sasl handler from sasl_h to sasl

---
 lib/sasl/src/sasl.erl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/sasl/src')

diff --git a/lib/sasl/src/sasl.erl b/lib/sasl/src/sasl.erl
index 57e0c6ca82..92b80694d7 100644
--- a/lib/sasl/src/sasl.erl
+++ b/lib/sasl/src/sasl.erl
@@ -131,7 +131,7 @@ add_sasl_logger(std, undefined) -> ok;
 add_sasl_logger(Dest, Level) ->
     FC = #{legacy_header=>true,
            single_line=>false},
-    ok = logger:add_handler(sasl_h,logger_std_h,
+    ok = logger:add_handler(sasl,logger_std_h,
                             #{level=>Level,
                               filter_default=>stop,
                               filters=>
@@ -146,7 +146,7 @@ add_sasl_logger(Dest, Level) ->
 delete_sasl_logger(undefined) -> ok;
 delete_sasl_logger(std) -> ok;
 delete_sasl_logger(_Type) ->
-    _ = logger:remove_handler(sasl_h),
+    _ = logger:remove_handler(sasl),
     ok.
 
 add_error_logger_mf(undefined) -> ok;
-- 
cgit v1.2.3


From 530d3cf99c562e3678eeb08e135ae90c4df4e052 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Thu, 17 May 2018 19:45:50 +0200
Subject: Rename module logger_simple to logger_simple_h

Also, change HandlerId from logger_simple to simple.
---
 lib/sasl/src/systools_make.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/sasl/src')

diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index f4b1b54fd1..6916107623 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -1551,7 +1551,7 @@ mandatory_modules() ->
      logger_server,
      logger_backend,
      logger_config,
-     logger_simple,
+     logger_simple_h,
      lists,
      proc_lib,
      supervisor
-- 
cgit v1.2.3