From c026109009942d7a877242f161860cc824223cf1 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Thu, 7 Jun 2018 16:23:19 +0200
Subject: [logger] Change default primary log level to 'notice'

Log events issued via error_logger:info_msg or
error_logger:info_report are now forwarded to Logger with level
'notice' instead of 'info'.

Log events issued by gen_* behaviours are also changed from level
'info' to level 'notice'.

Progress reports are still 'info', and can therefore easily be
included/excluded by changing the primary log level. By default, they
are not logged.
---
 lib/kernel/src/logger_formatter.erl | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 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 6eeac994ea..4ebd88ac2d 100644
--- a/lib/kernel/src/logger_formatter.erl
+++ b/lib/kernel/src/logger_formatter.erl
@@ -234,7 +234,7 @@ format_mfa(MFA) ->
 maybe_add_legacy_header(Level,
                         #{time:=Timestamp}=Meta,
                         #{legacy_header:=true}=Config) ->
-    #{title:=Title}=MyMeta = add_legacy_title(Level,maps:get(?MODULE,Meta,#{})),
+    #{title:=Title}=MyMeta = add_legacy_title(Level,Meta,Config),
     {{Y,Mo,D},{H,Mi,S},Micro,UtcStr} =
         timestamp_to_datetimemicro(Timestamp,Config),
     Header =
@@ -244,11 +244,23 @@ maybe_add_legacy_header(Level,
 maybe_add_legacy_header(_,Meta,_) ->
     Meta.
 
-add_legacy_title(_Level,#{title:=_}=MyMeta) ->
+add_legacy_title(_Level,#{?MODULE:=#{title:=_}=MyMeta},_) ->
     MyMeta;
-add_legacy_title(Level,MyMeta) ->
-    Title = string:uppercase(atom_to_list(Level)) ++ " REPORT",
-    MyMeta#{title=>Title}.
+add_legacy_title(Level,Meta,Config) ->
+    case maps:get(?MODULE,Meta,#{}) of
+        #{title:=_}=MyMeta ->
+            MyMeta;
+        MyMeta ->
+            TitleLevel =
+                case (Level=:=notice andalso maps:find(error_logger,Meta)) of
+                    {ok,_} ->
+                        maps:get(error_logger_notice_header,Config);
+                    _ ->
+                        Level
+                end,
+            Title = string:uppercase(atom_to_list(TitleLevel)) ++ " REPORT",
+            MyMeta#{title=>Title}
+    end.
 
 month(1) -> "Jan";
 month(2) -> "Feb";
@@ -268,6 +280,7 @@ month(12) -> "Dec".
 add_default_config(Config0) ->
     Default =
         #{legacy_header=>false,
+          error_logger_notice_header=>info,
           single_line=>true,
           chars_limit=>unlimited,
           time_designator=>$T},
@@ -352,6 +365,9 @@ do_check_config([{single_line,SL}|Config]) when is_boolean(SL) ->
     do_check_config(Config);
 do_check_config([{legacy_header,LH}|Config]) when is_boolean(LH) ->
     do_check_config(Config);
+do_check_config([{error_logger_notice_header,ELNH}|Config]) when ELNH == info;
+                                                                 ELNH == notice ->
+    do_check_config(Config);
 do_check_config([{report_cb,RCB}|Config]) when is_function(RCB,1) ->
     do_check_config(Config);
 do_check_config([{template,T}|Config]) ->
-- 
cgit v1.2.3