[logger] Add ?LOG macro which takes Level as argument

3 files changed, 39 insertions, 3 deletions

diff --git a/lib/kernel/doc/src/logger.xml b/lib/kernel/doc/src/logger.xml
index b1321a93dc..8bf62a6b39 100644
--- a/lib/kernel/doc/src/logger.xml
+++ b/lib/kernel/doc/src/logger.xml
@@ -290,13 +290,16 @@ logger:error("error happened because: ~p", [Reason]). % Without macro
       <item><c>?LOG_INFO(FunOrFormat,Args[,Metadata])</c></item>
       <item><c>?LOG_DEBUG(StringOrReport[,Metadata])</c></item>
       <item><c>?LOG_DEBUG(FunOrFormat,Args[,Metadata])</c></item>
+      <item><c>?LOG(Level,StringOrReport[,Metadata])</c></item>
+      <item><c>?LOG(Level,FunOrFormat,Args[,Metadata])</c></item>
     </list>
 
     <p>All macros expand to a call to Logger, where <c>Level</c> is
-      taken from the macro name, and location data is added to the
-      metadata. See the description of
+      taken from the macro name, or from the first argument in the
+      case of the <c>?LOG</c> macro. Location data is added to the
+      metadata as described under
       the <seealso marker="#type-metadata"><c>metadata()</c></seealso>
-      type for more information about the location data.</p>
+      type definition.</p>
 
     <p>The call is wrapped in a case statement and will be evaluated
       only if <c>Level</c> is equal to or below the configured log
diff --git a/lib/kernel/include/logger.hrl b/lib/kernel/include/logger.hrl
index 2143ccd297..b09977e0f2 100644
--- a/lib/kernel/include/logger.hrl
+++ b/lib/kernel/include/logger.hrl
@@ -32,6 +32,10 @@
 -define(LOG_DEBUG(A,B),?DO_LOG(debug,[A,B])).
 -define(LOG_DEBUG(A,B,C),?DO_LOG(debug,[A,B,C])).
 
+-define(LOG(L,A),?DO_LOG(L,[A])).
+-define(LOG(L,A,B),?DO_LOG(L,[A,B])).
+-define(LOG(L,A,B,C),?DO_LOG(L,[A,B,C])).
+
 -define(LOCATION,#{mfa=>{?MODULE,?FUNCTION_NAME,?FUNCTION_ARITY},
                    line=>?LINE,
                    file=>?FILE}).
diff --git a/lib/kernel/test/logger_SUITE.erl b/lib/kernel/test/logger_SUITE.erl
index b367b4dd54..bb9a6acdcc 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) ->
@@ -1009,6 +1010,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) ->