aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src/logger_internal.hrl
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2019-01-21 14:26:07 +0100
committerSiri Hansen <[email protected]>2019-01-21 14:26:07 +0100
commita8364425a7190b65cd33e58ac3c155a77c462b74 (patch)
treec659252e6397483d1f1771485cfee80b198a3fbb /lib/kernel/src/logger_internal.hrl
parenta5682ac818347a5091ba7dbc88928e8a634f15ec (diff)
parentf7123f64f6fa1727b49648e4335720910d8f10bf (diff)
downloadotp-a8364425a7190b65cd33e58ac3c155a77c462b74.tar.gz
otp-a8364425a7190b65cd33e58ac3c155a77c462b74.tar.bz2
otp-a8364425a7190b65cd33e58ac3c155a77c462b74.zip
Merge branch 'siri/logger/erts-and-remote-log-olp' into maint
* siri/logger/erts-and-remote-log-olp: [logger] Update bench marks to report percent instead of 0.XX [logger] Minor fix in logger_olp_SUITE to avoid error in end_per_testcase [logger] Remove info and reset functions from handler modules [logger] Remove some unused variable warnings [logger] Store proxy config in logger ets table [logger] Log mode change and flushes in logger_proxy [logger] Move out overload protection macros from logger_h_common.hrl [logger] Allow logger_olp callbacks to return {stop,...} Add logger_stress_SUITE to benchmarks spec [logger] Add idle timer in logger_olp [logger] Use persistent_term for storing proxy reference Update preloaded Use system_time instead of monotonic_time in log events [logger] Add test for restart of logger proxy [logger] Add API function for configuring logger proxy [logger] Add logger_stress_SUITE [logger] Add tests for logger_proxy [logger] Overload protect logging from erts and remote nodes [logger] Split overload protection functionality to own module
Diffstat (limited to 'lib/kernel/src/logger_internal.hrl')
-rw-r--r--lib/kernel/src/logger_internal.hrl9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/kernel/src/logger_internal.hrl b/lib/kernel/src/logger_internal.hrl
index d96a4ac78b..e53922e5d3 100644
--- a/lib/kernel/src/logger_internal.hrl
+++ b/lib/kernel/src/logger_internal.hrl
@@ -19,6 +19,7 @@
%%
-include_lib("kernel/include/logger.hrl").
-define(LOGGER_TABLE,logger).
+-define(PROXY_KEY,'$proxy_config$').
-define(PRIMARY_KEY,'$primary_config$').
-define(HANDLER_KEY,'$handler_config$').
-define(LOGGER_META_KEY,'$logger_metadata$').
@@ -40,12 +41,14 @@
-define(DEFAULT_LOGGER_CALL_TIMEOUT, infinity).
--define(LOG_INTERNAL(Level,Report),
+-define(LOG_INTERNAL(Level,Report),?DO_LOG_INTERNAL(Level,[Report])).
+-define(LOG_INTERNAL(Level,Format,Args),?DO_LOG_INTERNAL(Level,[Format,Args])).
+-define(DO_LOG_INTERNAL(Level,Data),
case logger:allow(Level,?MODULE) of
true ->
%% Spawn this to avoid deadlocks
- _ = spawn(logger,macro_log,[?LOCATION,Level,Report,
- logger:add_default_metadata(#{})]),
+ _ = spawn(logger,macro_log,[?LOCATION,Level|Data]++
+ [logger:add_default_metadata(#{})]),
ok;
false ->
ok