From f1bc93b60b105ccab3dafa151ff1740309673287 Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Sat, 30 Nov 2024 21:06:27 +0800 Subject: [PATCH] =?UTF-8?q?ft:=20error=5Flogger=E7=9A=84=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A8=A1=E5=9D=97=E5=92=8C=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/lgDef.hrl | 2 +- src/errLogger/lgErrLoggerH.erl | 12 ++++++------ src/formatter/lgFmtTer.erl | 11 +++++++++++ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/include/lgDef.hrl b/include/lgDef.hrl index 92fed68..3c54d93 100644 --- a/include/lgDef.hrl +++ b/include/lgDef.hrl @@ -67,7 +67,7 @@ %% 默认日志文件选项 -define(LgDefHandler, [ - % {lgBkdConsole, [{level, '>=info'}]}, + {lgBkdConsole, [{level, '>=debug'}]}, {lgBkdFile, [{id, info}, {file, <<"info.log">>}, {level, '>=info'}, {size, 10485760}, {date, <<"$D0">>}]}, {lgBkdFile, [{id, error}, {file, <<"error.log">>}, {level, '>=error'}, {size, 10485760}, {date, <<"$D0">>}]} ]). diff --git a/src/errLogger/lgErrLoggerH.erl b/src/errLogger/lgErrLoggerH.erl index f1d97eb..6a15192 100644 --- a/src/errLogger/lgErrLoggerH.erl +++ b/src/errLogger/lgErrLoggerH.erl @@ -45,12 +45,12 @@ true -> if is_pid(PidOrMd) -> - eLog:doLogImpl(Severity, PidOrMd, 'Undef', 'Undef', 0, [], Msg, [], -1, Sink, safe); + eLog:doLogImpl(Severity, PidOrMd, 'error_logger', lgFmtTer:errSeverity(Severity), 0, [], Msg, [], -1, Sink, safe); is_list(PidOrMd) -> {_, LogPid} = lists:keyfind(pid, 1, PidOrMd), - eLog:doLogImpl(Severity, LogPid, 'Undef', 'Undef', 0, lists:keydelete(pid, 1, PidOrMd), Msg, [], -1, Sink, safe); + eLog:doLogImpl(Severity, LogPid, 'error_logger', lgFmtTer:errSeverity(Severity), 0, lists:keydelete(pid, 1, PidOrMd), Msg, [], -1, Sink, safe); true -> - eLog:doLogImpl(Severity, list_to_pid("<0.0.0>"), 'Undef', 'Undef', 0, [], Msg, [{tag, PidOrMd}], -1, Sink, safe) + eLog:doLogImpl(Severity, list_to_pid("<0.0.0>"), 'error_logger', lgFmtTer:errSeverity(Severity), 0, [], Msg, [{tag, PidOrMd}], -1, Sink, safe) end, logged; _ -> no_log @@ -63,12 +63,12 @@ true -> if is_pid(PidOrMd) -> - eLog:doLogImpl(Severity, PidOrMd, 'Undef', 'Undef', 0, [], Fmt, Args, -1, Sink, safe); + eLog:doLogImpl(Severity, PidOrMd, 'error_logger', lgFmtTer:errSeverity(Severity), 0, [], Fmt, Args, -1, Sink, safe); is_list(PidOrMd) -> {_, LogPid} = lists:keyfind(pid, 1, PidOrMd), - eLog:doLogImpl(Severity, LogPid, 'Undef', 'Undef', 0, lists:keydelete(pid, 1, PidOrMd), Fmt, Args, -1, Sink, safe); + eLog:doLogImpl(Severity, LogPid, 'error_logger', lgFmtTer:errSeverity(Severity), 0, lists:keydelete(pid, 1, PidOrMd), Fmt, Args, -1, Sink, safe); true -> - eLog:doLogImpl(Severity, list_to_pid("<0.0.0>"), 'Undef', 'Undef', 0, [{tag, PidOrMd}], Fmt, Args, -1, Sink, safe) + eLog:doLogImpl(Severity, list_to_pid("<0.0.0>"), 'error_logger', lgFmtTer:errSeverity(Severity), 0, [{tag, PidOrMd}], Fmt, Args, -1, Sink, safe) end, logged; _ -> no_log diff --git a/src/formatter/lgFmtTer.erl b/src/formatter/lgFmtTer.erl index 02a66c1..faf72ff 100644 --- a/src/formatter/lgFmtTer.erl +++ b/src/formatter/lgFmtTer.erl @@ -9,6 +9,7 @@ format/2 , format/3 , fmtCfg/1 + , errSeverity/1 ]). %% @@ -228,6 +229,16 @@ loSeverity(?llvAlert) -> <<"alert">>; loSeverity(?llvEmergency) -> <<"emergency">>; loSeverity(?llvNone) -> <<"none">>. +errSeverity(?llvDebug) -> 'debug'; +errSeverity(?llvInfo) -> 'info'; +errSeverity(?llvNotice) -> 'notice'; +errSeverity(?llvWarning) -> 'warning'; +errSeverity(?llvError) -> 'error'; +errSeverity(?llvCritical) -> 'critical'; +errSeverity(?llvAlert) -> 'alert'; +errSeverity(?llvEmergency) -> 'emergency'; +errSeverity(?llvNone) -> 'Undef'. + upSeverity(?llvDebug) -> <<"DEBUG">>; upSeverity(?llvInfo) -> <<"INFO">>; upSeverity(?llvNotice) -> <<"NOTICE">>;