From 0deea4a8f369013ec00e231d0c2c37e4ab3f0ba1 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Tue, 24 Apr 2018 14:26:31 +0200
Subject: Add logger

---
 lib/kernel/src/logger_internal.hrl | 96 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 lib/kernel/src/logger_internal.hrl

(limited to 'lib/kernel/src/logger_internal.hrl')

diff --git a/lib/kernel/src/logger_internal.hrl b/lib/kernel/src/logger_internal.hrl
new file mode 100644
index 0000000000..8fcaba8de6
--- /dev/null
+++ b/lib/kernel/src/logger_internal.hrl
@@ -0,0 +1,96 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2017. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-include_lib("kernel/include/logger.hrl").
+-define(LOGGER_TABLE,logger).
+-define(LOGGER_KEY,'$logger_config$').
+-define(HANDLER_KEY,'$handler_config$').
+-define(LOGGER_META_KEY,'$logger_metadata$').
+-define(STANDARD_HANDLER, logger_std_h).
+-define(DEFAULT_LOGGER_CALL_TIMEOUT, 10000).
+-define(DEFAULT_HANDLER_FILTERS,
+        ?DEFAULT_HANDLER_FILTERS([beam,erlang,otp])).
+-define(DEFAULT_HANDLER_FILTERS(Domain),
+        [{remote_gl,{fun logger_filters:remote_gl/2,stop}},
+         {domain,{fun logger_filters:domain/2,{log,prefix_of,Domain}}},
+         {no_domain,{fun logger_filters:domain/2,{log,no_domain,[]}}}]).
+-define(DEFAULT_FORMATTER,logger_formatter).
+-define(DEFAULT_FORMAT_CONFIG,#{legacy_header=>true,
+                                template=>?DEFAULT_FORMAT_TEMPLATE_HEADER}).
+-define(DEFAULT_FORMAT_TEMPLATE_HEADER,
+        [{logger_formatter,header},"\n",msg,"\n"]).
+-define(DEFAULT_FORMAT_TEMPLATE_SINGLE,
+        [time," ",level,": ",msg,"\n"]).
+-define(DEFAULT_FORMAT_TEMPLATE,
+        [time," ",level,":\n",msg,"\n"]).
+
+-define(LOG_INTERNAL(Level,Report),
+        case logger:allow(Level,?MODULE) of
+            true ->
+                _ = spawn(logger,macro_log,[?LOCATION,Level,Report,
+                                            logger:add_default_metadata(#{})]),
+                ok;
+            false ->
+                ok
+        end).
+
+%%%-----------------------------------------------------------------
+%%% Levels
+%%% Using same as syslog
+-define(LEVELS,[emergency,
+                alert,
+                critical,
+                error,
+                warning,
+                notice,
+                info,
+                debug]).
+-define(EMERGENCY,0).
+-define(ALERT,1).
+-define(CRITICAL,2).
+-define(ERROR,3).
+-define(WARNING,4).
+-define(NOTICE,5).
+-define(INFO,6).
+-define(DEBUG,7).
+
+-define(IS_LEVEL(L),
+        (L=:=emergency orelse
+            L=:=alert orelse
+            L=:=critical orelse
+            L=:=error orelse
+            L=:=warning orelse
+            L=:=notice orelse
+            L=:=info orelse
+            L=:=debug)).
+
+-define(IS_MSG(Msg),
+        ((is_tuple(Msg) andalso tuple_size(Msg)==2)
+         andalso
+           (is_list(element(1,Msg)) andalso is_list(element(2,Msg)))
+         orelse
+           (element(1,Msg)==report andalso ?IS_REPORT(element(2,Msg)))
+         orelse
+           (element(1,Msg)==string andalso ?IS_STRING(element(2,Msg))))).
+
+-define(IS_REPORT(Report),
+        (is_map(Report) orelse (is_list(Report) andalso is_tuple(hd(Report))))).
+
+-define(IS_STRING(String),
+        (is_list(String) orelse is_binary(String))).
-- 
cgit v1.2.3


From c54be0299219c32e5b66df952cf6d260ef2dadfa Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Wed, 25 Apr 2018 15:48:09 +0200
Subject: Set call timeout for logger_server to infinity

This is to avoid failing starts when running make with '-j',
i.e. maximum parallell make (or on extremely slow machines).
---
 lib/kernel/src/logger_internal.hrl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib/kernel/src/logger_internal.hrl')

diff --git a/lib/kernel/src/logger_internal.hrl b/lib/kernel/src/logger_internal.hrl
index 8fcaba8de6..82df499c2b 100644
--- a/lib/kernel/src/logger_internal.hrl
+++ b/lib/kernel/src/logger_internal.hrl
@@ -23,7 +23,6 @@
 -define(HANDLER_KEY,'$handler_config$').
 -define(LOGGER_META_KEY,'$logger_metadata$').
 -define(STANDARD_HANDLER, logger_std_h).
--define(DEFAULT_LOGGER_CALL_TIMEOUT, 10000).
 -define(DEFAULT_HANDLER_FILTERS,
         ?DEFAULT_HANDLER_FILTERS([beam,erlang,otp])).
 -define(DEFAULT_HANDLER_FILTERS(Domain),
@@ -40,9 +39,12 @@
 -define(DEFAULT_FORMAT_TEMPLATE,
         [time," ",level,":\n",msg,"\n"]).
 
+-define(DEFAULT_LOGGER_CALL_TIMEOUT, infinity).
+
 -define(LOG_INTERNAL(Level,Report),
         case logger:allow(Level,?MODULE) of
             true ->
+                %% Spawn this to avoid deadlocks
                 _ = spawn(logger,macro_log,[?LOCATION,Level,Report,
                                             logger:add_default_metadata(#{})]),
                 ok;
-- 
cgit v1.2.3