diff options
| author | Siri Hansen <[email protected]> | 2019-01-21 14:46:33 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2019-01-21 14:46:33 +0100 |
| commit | 9c8075413728e3be373d7dff2a7168b3983e0be3 (patch) | |
| tree | 35a3ed275f2ea6f333f5be903e39ddbe6c5a9700 /lib/kernel/src/logger_internal.hrl | |
| parent | 88cc8d25abe9e6fb7708a6ea673aa0637a28860a (diff) | |
| parent | a8364425a7190b65cd33e58ac3c155a77c462b74 (diff) | |
| download | otp-9c8075413728e3be373d7dff2a7168b3983e0be3.tar.gz otp-9c8075413728e3be373d7dff2a7168b3983e0be3.tar.bz2 otp-9c8075413728e3be373d7dff2a7168b3983e0be3.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/kernel/src/logger_internal.hrl')
| -rw-r--r-- | lib/kernel/src/logger_internal.hrl | 9 |
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 |