Set legacy_header=true for kernel's default handler only

4 files changed, 29 insertions, 13 deletions

diff --git a/lib/kernel/test/logger_disk_log_h_SUITE.erl b/lib/kernel/test/logger_disk_log_h_SUITE.erl
index 3aa1c3557b..7a1736c814 100644
--- a/lib/kernel/test/logger_disk_log_h_SUITE.erl
+++ b/lib/kernel/test/logger_disk_log_h_SUITE.erl
@@ -336,24 +336,24 @@ formatter_fail(Config) ->
     {ok,{_,#{formatter:={logger_formatter,_}}}} =
         logger:get_handler_config(Name),
     logger:info(M1=?msg,?domain),
-    Got1 = try_match_file(?log_no(LogFile,1),"=INFO REPORT====.*\n"++M1,5000),
+    Got1 = try_match_file(?log_no(LogFile,1),"[0-9\\+\\-T:\\.]* info: "++M1,5000),
 
     ok = logger:set_handler_config(Name,formatter,{nonexistingmodule,#{}}),
     logger:info(M2=?msg,?domain),
     Got2 = try_match_file(?log_no(LogFile,1),
-                          Got1++"=INFO REPORT====.*\nFORMATTER CRASH: .*"++M2,
+                          escape(Got1)++"[0-9\\+\\-T:\\.]* info: FORMATTER CRASH: .*"++M2,
                           5000),
 
     ok = logger:set_handler_config(Name,formatter,{?MODULE,crash}),
     logger:info(M3=?msg,?domain),
     Got3 = try_match_file(?log_no(LogFile,1),
-                          Got2++"=INFO REPORT====.*\nFORMATTER CRASH: .*"++M3,
+                          escape(Got2)++"[0-9\\+\\-T:\\.]* info: FORMATTER CRASH: .*"++M3,
                           5000),
 
     ok = logger:set_handler_config(Name,formatter,{?MODULE,bad_return}),
     logger:info(?msg,?domain),
     try_match_file(?log_no(LogFile,1),
-                   Got3++"FORMATTER ERROR: bad_return_value",
+                   escape(Got3)++"FORMATTER ERROR: bad_return_value",
                    5000),
 
     %% Check that handler is still alive and was never dead
@@ -1491,3 +1491,10 @@ check_tracer(T) ->
             dbg:stop_clear(),
             ct:fail({timeout,tracer})
     end.
+
+escape([$+|Rest]) ->
+    [$\\,$+|escape(Rest)];
+escape([H|T]) ->
+    [H|escape(T)];
+escape([]) ->
+    [].
diff --git a/lib/kernel/test/logger_env_var_SUITE.erl b/lib/kernel/test/logger_env_var_SUITE.erl
index 764f443634..32612d616e 100644
--- a/lib/kernel/test/logger_env_var_SUITE.erl
+++ b/lib/kernel/test/logger_env_var_SUITE.erl
@@ -542,8 +542,8 @@ logger_many_handlers(Config, Env, LogErr, LogInfo, NumProgress) ->
     ok = rpc:call(Node,logger_std_h,filesync,[info]),
     {ok, Bin} = file:read_file(LogInfo),
     ct:log("Log content:~n~s",[Bin]),
-    match(Bin,<<"PROGRESS REPORT">>,NumProgress,info,info),
-    match(Bin,<<"ALERT REPORT">>,0,alert,info),
+    match(Bin,<<"info:">>,NumProgress+1,info,info),
+    match(Bin,<<"alert:">>,0,alert,info),
 
     ok.
 
diff --git a/lib/kernel/test/logger_simple_SUITE.erl b/lib/kernel/test/logger_simple_SUITE.erl
index 0d505b14f5..d7f9fa21cf 100644
--- a/lib/kernel/test/logger_simple_SUITE.erl
+++ b/lib/kernel/test/logger_simple_SUITE.erl
@@ -138,7 +138,8 @@ replace_file(Config) ->
 
     ok = rpc:call(Node, logger, add_handlers,
                   [[{handler, default, logger_std_h,
-                     #{ logger_std_h => #{ type => {file, File} }}}]]),
+                     #{ logger_std_h => #{ type => {file, File} },
+                        formatter => {?DEFAULT_FORMATTER,?DEFAULT_FORMAT_CONFIG}}}]]),
 
     {ok,Bin} = sync_and_read(Node, file, File),
     Lines = [unicode:characters_to_list(L) ||
@@ -181,7 +182,8 @@ replace_disk_log(Config) ->
 
     ok = rpc:call(Node, logger, add_handlers,
                   [[{handler, default, logger_disk_log_h,
-                     #{ disk_log_opts => #{ file => File }}}]]),
+                     #{ disk_log_opts => #{ file => File },
+                        formatter => {?DEFAULT_FORMATTER,?DEFAULT_FORMAT_CONFIG}}}]]),
     {ok,Bin} = sync_and_read(Node, disk_log, File),
     Lines = [unicode:characters_to_list(L) ||
                 L <- binary:split(Bin,<<"\n">>,[global,trim])],
diff --git a/lib/kernel/test/logger_std_h_SUITE.erl b/lib/kernel/test/logger_std_h_SUITE.erl
index fc59d393e0..5764abd063 100644
--- a/lib/kernel/test/logger_std_h_SUITE.erl
+++ b/lib/kernel/test/logger_std_h_SUITE.erl
@@ -250,24 +250,24 @@ formatter_fail(Config) ->
     {ok,{_,#{formatter:={logger_formatter,_}}}} =
         logger:get_handler_config(?MODULE),
     logger:info(M1=?msg,?domain),
-    Got1 = try_match_file(Log,"=INFO REPORT====.*\n"++M1,5000),
+    Got1 = try_match_file(Log,"[0-9\\+\\-T:\\.]* info: "++M1,5000),
 
     ok = logger:set_handler_config(?MODULE,formatter,{nonexistingmodule,#{}}),
     logger:info(M2=?msg,?domain),
     Got2 = try_match_file(Log,
-                          Got1++"=INFO REPORT====.*\nFORMATTER CRASH: .*"++M2,
+                          escape(Got1)++"[0-9\\+\\-T:\\.]* info: FORMATTER CRASH: .*"++M2,
                           5000),
 
     ok = logger:set_handler_config(?MODULE,formatter,{?MODULE,crash}),
     logger:info(M3=?msg,?domain),
     Got3 = try_match_file(Log,
-                          Got2++"=INFO REPORT====.*\nFORMATTER CRASH: .*"++M3,
+                          escape(Got2)++"[0-9\\+\\-T:\\.]* info: FORMATTER CRASH: .*"++M3,
                           5000),
 
     ok = logger:set_handler_config(?MODULE,formatter,{?MODULE,bad_return}),
     logger:info(?msg,?domain),
     try_match_file(Log,
-                   Got3++"FORMATTER ERROR: bad_return_value",
+                   escape(Got3)++"FORMATTER ERROR: bad_return_value",
                    5000),
 
     %% Check that handler is still alive and was never dead
@@ -1020,7 +1020,7 @@ mem_kill_new(Config) ->
                 killed ->
                     ct:pal("Slow shutdown, handler process was killed!", [])
             end,
-            timer:sleep(RestartAfter + 2000),
+            timer:sleep(RestartAfter * 3),
             true = is_pid(whereis(?MODULE)),
             ok
     after
@@ -1518,3 +1518,10 @@ check_tracer(T,TimeoutFun) ->
             dbg:stop_clear(),
             TimeoutFun()
     end.
+
+escape([$+|Rest]) ->
+    [$\\,$+|escape(Rest)];
+escape([H|T]) ->
+    [H|escape(T)];
+escape([]) ->
+    [].