diff options
| author | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-10-18 22:00:37 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-10-18 22:00:37 +0300 |
| commit | 9ff6cc25dc9db7ba453acf7b6d7f7374e01f9d86 (patch) | |
| tree | 1558895044ba3a49708d5f69345d538b72f7a7b3 /src | |
| parent | Replace lager with built-in new logging API (diff) | |
Log supervisor reports in debug loglevel
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_logger.erl | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/src/ejabberd_logger.erl b/src/ejabberd_logger.erl index c1abd19b7..d90ff88df 100644 --- a/src/ejabberd_logger.erl +++ b/src/ejabberd_logger.erl @@ -30,6 +30,7 @@ %% API -export([start/0, get/0, set/1, get_log_path/0, flush/0]). -export([convert_loglevel/1, loglevels/0]). +-export([progress_filter/2]). %% Deprecated functions -export([restart/0, reopen_log/0, rotate_log/0]). -deprecated([{restart, 0}, @@ -111,7 +112,7 @@ start(Level) -> ConsoleFmtConfig = FmtConfig#{template => console_template()}, logger:set_primary_config(level, Level), logger:add_primary_filter(progress_report, - {fun logger_filters:progress/2, stop}), + {fun ?MODULE:progress_filter/2, stop}), logger:update_formatter_config(default, ConsoleFmtConfig), logger:add_handler(ejabberd_log, logger_std_h, #{level => all, @@ -126,12 +127,26 @@ start(Level) -> restart() -> ok. +progress_filter(#{level:=info,msg:={report,#{label:={_,progress}}}} = Event, _) -> + case get() of + debug -> + logger_filters:progress(Event#{level => debug}, log); + _ -> + stop + end; +progress_filter(Event, _) -> + Event. + console_template() -> - [time, " [", level, "] ", msg, io_lib:nl()]. + [time, " [", level, "] " | msg()]. file_template() -> [time, " [", level, "] ", pid, - {mfa, ["@", mfa, {line, [":", line], []}], []}, " ", msg, io_lib:nl()]. + {mfa, ["@", mfa, {line, [":", line], []}], []}, " " | msg()]. + +msg() -> + [{logger_formatter, [[logger_formatter, title], ":", io_lib:nl()], []}, + msg, io_lib:nl()]. reopen_log() -> ok. |