Merge branch 'maint'

5 files changed, 132 insertions, 40 deletions

diff --git a/lib/kernel/test/logger_SUITE.erl b/lib/kernel/test/logger_SUITE.erl
index b367b4dd54..8f74ebdc47 100644
--- a/lib/kernel/test/logger_SUITE.erl
+++ b/lib/kernel/test/logger_SUITE.erl
@@ -355,6 +355,7 @@ log_all_levels_api(cleanup,_Config) ->
 macros(_Config) ->
     ok = logger:add_handler(h1,?MODULE,#{level=>all,filter_default=>log}),
     test_macros(emergency),
+    test_log_macro(alert),
     ok.
 
 macros(cleanup,_Config) ->
@@ -469,7 +470,11 @@ filter_failed(_Config) ->
     %% Logger filters
     {error,{invalid_filter,_}} =
         logger:add_primary_filter(lf,{fun(_) -> ok end,args}),
-    ok = logger:add_primary_filter(lf,{fun(_,_) -> a=b end,args}),
+    ok = logger:add_primary_filter(lf,
+                                   {fun(_,_) ->
+                                            erlang:error({badmatch,b})
+                                    end,
+                                    args}),
     #{filters:=[_]} = logger:get_primary_config(),
     ok = logger:notice(M1=?map_rep),
     ok = check_logged(notice,M1,#{}),
@@ -487,7 +492,11 @@ filter_failed(_Config) ->
     {error,{not_found,h0}} = logger:remove_handler_filter(h0,hf),
     {error,{invalid_filter,_}} =
         logger:add_handler_filter(h1,hf,{fun(_) -> ok end,args}),
-    ok = logger:add_handler_filter(h1,hf,{fun(_,_) -> a=b end,args}),
+    ok = logger:add_handler_filter(h1,hf,
+                                   {fun(_,_) ->
+                                            erlang:error({badmatch,b})
+                                    end,
+                                    args}),
     {ok,#{filters:=[_]}} = logger:get_handler_config(h1),
     ok = logger:notice(M3=?map_rep),
     ok = check_logged(notice,M3,#{}),
@@ -523,7 +532,11 @@ handler_failed(_Config) ->
     false = lists:search(fun(#{id:=h1}) -> true; (_) -> false end,H1),
     {error,{not_found,h1}} = logger:remove_handler(h1),
 
-    ok = logger:add_handler(h2,?MODULE,#{filter_default=>log,log_call=>fun() -> a = b end}),
+    ok = logger:add_handler(h2,?MODULE,
+                            #{filter_default => log,
+                              log_call => fun() ->
+                                                  erlang:error({badmatch,b})
+                                          end}),
     {error,{already_exist,h2}} = logger:add_handler(h2,othermodule,#{}),
     [add] = test_server:messages_get(),
 
@@ -534,7 +547,7 @@ handler_failed(_Config) ->
     {error,{not_found,h2}} = logger:remove_handler(h2),
 
     CallAddHandler = fun() -> logger:add_handler(h2,?MODULE,#{}) end,
-    CrashHandler = fun() -> a = b end,
+    CrashHandler = fun() -> erlang:error({badmatch,b}) end,
     KillHandler = fun() -> exit(self(), die) end,
 
     {error,{handler_not_added,{attempting_syncronous_call_to_self,_}}} =
@@ -1009,6 +1022,34 @@ test_macros(emergency=Level) ->
                       [{F2,x},{error,fun_that_crashes}],#{}),
     ok.
 
+test_log_macro(Level) ->
+    ?LOG(Level,#{Level=>rep}),
+    ok = check_logged(Level,#{Level=>rep},?MY_LOC(1)),
+    ?LOG(Level,#{Level=>rep},#{my=>meta}),
+    ok = check_logged(Level,#{Level=>rep},(?MY_LOC(1))#{my=>meta}),
+    ?LOG(Level,"~w: ~w",[Level,fa]),
+    ok = check_logged(Level,"~w: ~w",[Level,fa],?MY_LOC(1)),
+    ?LOG(Level,"~w: ~w ~w",[Level,fa,meta],#{my=>meta}),
+    ok = check_logged(Level,"~w: ~w ~w",[Level,fa,meta],(?MY_LOC(1))#{my=>meta}),
+    ?LOG(Level,fun(x) -> {"~w: ~w ~w",[Level,fun_to_fa,meta]} end,
+                   x, #{my=>meta}),
+    ok = check_logged(Level,"~w: ~w ~w",[Level,fun_to_fa,meta],
+                      (?MY_LOC(3))#{my=>meta}),
+    ?LOG(Level,fun(x) -> #{Level=>fun_to_r,meta=>true} end, x, #{my=>meta}),
+    ok = check_logged(Level,#{Level=>fun_to_r,meta=>true},
+                      (?MY_LOC(2))#{my=>meta}),
+    ?LOG(Level,fun(x) -> <<"fun_to_s">> end,x,#{}),
+    ok = check_logged(Level,<<"fun_to_s">>,?MY_LOC(1)),
+    F1=fun(x) -> {fun_to_bad} end,
+    ?LOG(Level,F1,x,#{}),
+    ok = check_logged(Level,"LAZY_FUN ERROR: ~tp; Returned: ~tp",
+                      [{F1,x},{fun_to_bad}],#{}),
+    F2=fun(x) -> erlang:error(fun_that_crashes) end,
+    ?LOG(Level,F2,x,#{}),
+    ok = check_logged(Level,"LAZY_FUN CRASH: ~tp; Reason: ~tp",
+                      [{F2,x},{error,fun_that_crashes}],#{}),
+    ok.
+
 %%%-----------------------------------------------------------------
 %%% Called by macro ?TRY(X)
 my_try(Fun) ->
diff --git a/lib/kernel/test/logger_disk_log_h_SUITE.erl b/lib/kernel/test/logger_disk_log_h_SUITE.erl
index 7e5b574869..a4b15c841b 100644
--- a/lib/kernel/test/logger_disk_log_h_SUITE.erl
+++ b/lib/kernel/test/logger_disk_log_h_SUITE.erl
@@ -1551,25 +1551,30 @@ h_proc_name() ->
 h_proc_name(Name) ->
     list_to_atom(lists:concat([logger_disk_log_h,"_",Name])).
 
-file_delete(Log) ->
-   file:delete(Log).
-
 wait_for_process_up(T) ->
-    wait_for_process_up(h_proc_name(),T).
+    wait_for_process_up(?MODULE, h_proc_name(), T).
 
-wait_for_process_up(Name,T) ->
+wait_for_process_up(Name, RegName, T) ->
     N = (T div 500) + 1,
-    wait_for_process_up1(Name,N).
+    wait_for_process_up1(Name, RegName, N).
 
-wait_for_process_up1(Name,0) ->
+wait_for_process_up1(_Name, _RegName, 0) ->
     error;
-wait_for_process_up1(Name,N) ->
+wait_for_process_up1(Name, RegName, N) ->
     timer:sleep(500),
-    case whereis(Name) of
+    case whereis(RegName) of
         Pid when is_pid(Pid) ->
-            %% ct:pal("Process ~p up (~p tries left)",[Name,N]),
-            {ok,Pid};
+            case logger:get_handler_config(Name) of
+                {ok,_} ->
+                    %% ct:pal("Process ~p up (~p tries left)",[Name,N]),
+                    {ok,Pid};
+                _ ->
+                    wait_for_process_up1(Name, RegName, N-1)
+            end;
         undefined ->
             %% ct:pal("Waiting for process ~p (~p tries left)",[Name,N]),
-            wait_for_process_up1(Name,N-1)
+            wait_for_process_up1(Name, RegName, N-1)
     end.
+
+file_delete(Log) ->
+   file:delete(Log).
diff --git a/lib/kernel/test/logger_env_var_SUITE.erl b/lib/kernel/test/logger_env_var_SUITE.erl
index 04a4364947..e8d1a313dc 100644
--- a/lib/kernel/test/logger_env_var_SUITE.erl
+++ b/lib/kernel/test/logger_env_var_SUITE.erl
@@ -71,6 +71,7 @@ all() ->
      sasl_compatible_false,
      sasl_compatible_false_no_progress,
      sasl_compatible,
+     all_logger_level,
      {group,bad},
      {group,error_logger},
      {group,logger}
@@ -572,6 +573,24 @@ sasl_compatible(Config) ->
                       0),% progress in std logger
     ok.
 
+all_logger_level(Config) ->
+    [all_logger_level(Config,Level) || Level <- [none,
+                                                 emergency,
+                                                 alert,
+                                                 critical,
+                                                 error,
+                                                 warning,
+                                                 notice,
+                                                 info,
+                                                 debug,
+                                                 all]],
+    ok.
+
+all_logger_level(Config,Level) ->
+    {ok,#{primary:=#{level:=Level}},Node} = setup(Config,[{logger_level,Level}]),
+    true = test_server:stop_node(Node),
+    ok.
+
 bad_error_logger(Config) ->
     error = setup(Config,[{error_logger,baddest}]).
 
diff --git a/lib/kernel/test/logger_formatter_SUITE.erl b/lib/kernel/test/logger_formatter_SUITE.erl
index 8fe8d5199b..aa8dc42691 100644
--- a/lib/kernel/test/logger_formatter_SUITE.erl
+++ b/lib/kernel/test/logger_formatter_SUITE.erl
@@ -312,30 +312,48 @@ format_msg(_Config) ->
                      #{report_cb=>fun(_)-> faulty_return end},
                      #{template=>Template}),
     ct:log(String5),
-    "REPORT_CB ERROR: term; Returned: faulty_return" = String5,
+    "REPORT_CB/1 ERROR: term; Returned: faulty_return" = String5,
 
     String6 = format(info,{report,term},
                      #{report_cb=>fun(_)-> erlang:error(fun_crashed) end},
                      #{template=>Template}),
     ct:log(String6),
-    "REPORT_CB CRASH: term; Reason: {error,fun_crashed}" = String6,
+    "REPORT_CB/1 CRASH: term; Reason: {error,fun_crashed,"++_ = String6,
+
+    String7 = format(info,{report,term},
+                     #{report_cb=>fun(_,_)-> ['not',a,string] end},
+                     #{template=>Template}),
+    ct:log(String7),
+    "REPORT_CB/2 ERROR: term; Returned: ['not',a,string]" = String7,
+
+    String8 = format(info,{report,term},
+                     #{report_cb=>fun(_,_)-> faulty_return end},
+                     #{template=>Template}),
+    ct:log(String8),
+    "REPORT_CB/2 ERROR: term; Returned: faulty_return" = String8,
+
+    String9 = format(info,{report,term},
+                     #{report_cb=>fun(_,_)-> erlang:error(fun_crashed) end},
+                     #{template=>Template}),
+    ct:log(String9),
+    "REPORT_CB/2 CRASH: term; Reason: {error,fun_crashed,"++_ = String9,
 
     %% strings are not formatted
-    String7 = format(info,{string,"string"},
+    String10 = format(info,{string,"string"},
                      #{report_cb=>fun(_)-> {"formatted",[]} end},
                      #{template=>Template}),
-    ct:log(String7),
-    "string" = String7,
+    ct:log(String10),
+    "string" = String10,
 
-    String8 = format(info,{string,['not',printable,list]},
+    String11 = format(info,{string,['not',printable,list]},
                      #{report_cb=>fun(_)-> {"formatted",[]} end},
                      #{template=>Template}),
-    ct:log("~ts",[String8]), % avoiding ct_log crash
-    "FORMAT ERROR: \"~ts\" - [['not',printable,list]]" = String8,
+    ct:log("~ts",[String11]), % avoiding ct_log crash
+    "FORMAT ERROR: \"~ts\" - [['not',printable,list]]" = String11,
 
-    String9 = format(info,{string,"string"},#{},#{template=>Template}),
-    ct:log(String9),
-    "string" = String9,
+    String12 = format(info,{string,"string"},#{},#{template=>Template}),
+    ct:log(String12),
+    "string" = String12,
 
     ok.
 
@@ -639,8 +657,10 @@ check_config(_Config) ->
     ?cfgerr({max_size,bad}) =
         logger_formatter:check_config(#{max_size => bad}),
 
+    ok =
+        logger_formatter:check_config(#{report_cb => fun(_,_) -> "" end}),
     ?cfgerr({report_cb,F}) =
-        logger_formatter:check_config(#{report_cb => F=fun(_,_) -> {"",[]} end}),
+        logger_formatter:check_config(#{report_cb => F=fun(_,_,_) -> {"",[]} end}),
     ?cfgerr({report_cb,bad}) =
         logger_formatter:check_config(#{report_cb => bad}),
 
diff --git a/lib/kernel/test/logger_std_h_SUITE.erl b/lib/kernel/test/logger_std_h_SUITE.erl
index ca54458ac1..0930cd4211 100644
--- a/lib/kernel/test/logger_std_h_SUITE.erl
+++ b/lib/kernel/test/logger_std_h_SUITE.erl
@@ -1570,27 +1570,29 @@ h_proc_name() ->
 h_proc_name(Name) ->
     ?name_to_reg_name(logger_std_h,Name).
 
-file_delete(Log) ->
-   file:delete(Log).
-
 wait_for_process_up(T) ->
-    wait_for_process_up(h_proc_name(),T).
+    wait_for_process_up(?MODULE, h_proc_name(), T).
 
-wait_for_process_up(Name,T) ->
+wait_for_process_up(Name, RegName, T) ->
     N = (T div 500) + 1,
-    wait_for_process_up1(Name,N).
+    wait_for_process_up1(Name, RegName, N).
 
-wait_for_process_up1(_Name,0) ->
+wait_for_process_up1(_Name, _RegName, 0) ->
     error;
-wait_for_process_up1(Name,N) ->
+wait_for_process_up1(Name, RegName, N) ->
     timer:sleep(500),
-    case whereis(Name) of
+    case whereis(RegName) of
         Pid when is_pid(Pid) ->
-            %% ct:pal("Process ~p up (~p tries left)",[Name,N]),
-            {ok,Pid};
+            case logger:get_handler_config(Name) of
+                {ok,_} ->
+                    %% ct:pal("Process ~p up (~p tries left)",[Name,N]),
+                    {ok,Pid};
+                _ ->
+                    wait_for_process_up1(Name, RegName, N-1)
+            end;
         undefined ->
             %% ct:pal("Waiting for process ~p (~p tries left)",[Name,N]),
-            wait_for_process_up1(Name,N-1)
+            wait_for_process_up1(Name, RegName, N-1)
     end.
 
 filesync_rep_int() ->
@@ -1598,3 +1600,8 @@ filesync_rep_int() ->
         true  -> 5500;
         false -> ?FILESYNC_REPEAT_INTERVAL + 500
     end.
+
+
+file_delete(Log) ->
+   file:delete(Log).
+