diff --git a/src/backend/lgBkdConsole.erl b/src/backend/lgBkdConsole.erl index 96cd96d..a423afd 100644 --- a/src/backend/lgBkdConsole.erl +++ b/src/backend/lgBkdConsole.erl @@ -48,12 +48,12 @@ init(Opts) -> {error, {fatal, old_shell}}; _ -> true = checkOpts(Opts), - CfgColors = ?IIF(lgUtil:get_env(colored, true), lgUtil:get_env(colors, []), []), + CfgColors = ?lgIIF(lgUtil:get_env(colored, true), lgUtil:get_env(colors, []), []), Colors = [{lgUtil:levelToNum(Level), ColorStr} || {Level, ColorStr} <- CfgColors], Level = lgUtil:get_opt(level, Opts, undefined), LevelMask = lgUtil:configToMask(Level), [UseErr, GroupLeader, Id, FmtTer, FmtCfg] = [lgUtil:get_opt(Key, Opts, Def) || {Key, Def} <- ?LgDefConsoleOpts], - Out = ?IIF(UseErr, standard_error, ?IIF(GroupLeader == false, user, begin erlang:monitor(process, GroupLeader), GroupLeader end)), + Out = ?lgIIF(UseErr, standard_error, ?lgIIF(GroupLeader == false, user, begin erlang:monitor(process, GroupLeader), GroupLeader end)), {ok, #state{level = LevelMask, id = Id, out = Out, fmtTer = FmtTer, fmtCfg = FmtCfg, colors = Colors}} end. @@ -61,7 +61,7 @@ checkOpts([]) -> true; checkOpts([{id, {?MODULE, _}} | T]) -> checkOpts(T); checkOpts([{level, Level} | T]) -> - ?IIF(lgUtil:validateLogLevel(Level) =/= false, checkOpts(T), {error, {bad_level, Level}}); + ?lgIIF(lgUtil:validateLogLevel(Level) =/= false, checkOpts(T), {error, {bad_level, Level}}); checkOpts([{use_stderr, Flag} | T]) when is_boolean(Flag) -> checkOpts(T); checkOpts([{fmtTer, M} | T]) when is_atom(M) -> @@ -121,7 +121,7 @@ code_change(_OldVsn, State, _Extra) -> {ok, State}. eol() -> - ?IIF(lgUtil:get_env(colored, true) andalso element(1, os:type()) =/= win32, <<"\e[0m\r\n">>, <<"\r\n">>). + ?lgIIF(lgUtil:get_env(colored, true) andalso element(1, os:type()) =/= win32, <<"\e[0m\r\n">>, <<"\r\n">>). isNewStyleConsole() -> %% Criteria: diff --git a/src/backend/lgBkdFile.erl b/src/backend/lgBkdFile.erl index 675433e..59e0156 100644 --- a/src/backend/lgBkdFile.erl +++ b/src/backend/lgBkdFile.erl @@ -73,11 +73,11 @@ init(Opts) -> %% 需要二次转换的配置在这里处理 Level = lgUtil:configToMask(CfgLevel), SyncOn = lgUtil:configToMask(CfgSyncOn), - CheckInt = ?IIF(CfgCheckInt == always, 0, CfgCheckInt), + CheckInt = ?lgIIF(CfgCheckInt == always, 0, CfgCheckInt), {ok, Date} = lgUtil:parseRotateSpec(CfgDate), FileName = lgUtil:parsePath(FBName), scheduleRotation(Date, FBName), - FmtCfg = ?IIF(CfgFmtCfg =/= [], CfgFmtCfg, begin MdWhitelist = lgUtil:get_env(mdWhitelist, []), lgFmtTer:fmtCfg(MdWhitelist) end), + FmtCfg = ?lgIIF(CfgFmtCfg =/= [], CfgFmtCfg, begin MdWhitelist = lgUtil:get_env(mdWhitelist, []), lgFmtTer:fmtCfg(MdWhitelist) end), Shaper = #lgShaper{hwm = Hwm, flushQueue = FlushQueue, flushThr = FlushThr, id = FBName}, TemState = #state{ @@ -199,7 +199,7 @@ writeLog(#state{fileName = FileName, fd = Fd, inode = Inode, cTime = CTime, flap writeFile(NewState, Level, Msg) end; {error, Reason} -> - ?IIF(Flap, State, begin ?INT_LOG(?llvError, <<"Failed to reopen log file ~ts with error ~s">>, [FileName, file:format_error(Reason)]), State#state{flap = true} end) + ?lgIIF(Flap, State, begin ?INT_LOG(?llvError, <<"Failed to reopen log file ~ts with error ~s">>, [FileName, file:format_error(Reason)]), State#state{flap = true} end) end; _ -> writeFile(State, Level, Msg) @@ -252,11 +252,11 @@ configToId(Config) -> end. checkOpts([], IsFile) -> - ?IIF(IsFile, true, {error, no_file_name}); + ?lgIIF(IsFile, true, {error, no_file_name}); checkOpts([{file, _File} | Tail], _IsFile) -> checkOpts(Tail, true); checkOpts([{level, Level} | Tail], IsFile) -> - ?IIF(lgUtil:validateLogLevel(Level) =/= false, checkOpts(Tail, IsFile), {error, {invalid_log_level, Level}}); + ?lgIIF(lgUtil:validateLogLevel(Level) =/= false, checkOpts(Tail, IsFile), {error, {invalid_log_level, Level}}); checkOpts([{size, Size} | Tail], IsFile) when is_integer(Size), Size >= 0 -> checkOpts(Tail, IsFile); checkOpts([{count, Count} | Tail], IsFile) when is_integer(Count), Count >= 0 -> @@ -274,7 +274,7 @@ checkOpts([{syncSize, SyncSize} | Tail], IsFile) when is_integer(SyncSize), Sync checkOpts([{checkInt, CheckInt} | Tail], IsFile) when is_integer(CheckInt), CheckInt >= 0; CheckInt == always -> checkOpts(Tail, IsFile); checkOpts([{syncOn, Level} | Tail], IsFile) -> - ?IIF(lgUtil:validateLogLevel(Level) =/= false, checkOpts(Tail, IsFile), {error, {invalid_sync_on, Level}}); + ?lgIIF(lgUtil:validateLogLevel(Level) =/= false, checkOpts(Tail, IsFile), {error, {invalid_sync_on, Level}}); checkOpts([{fmtTer, Fmt} | Tail], IsFile) when is_atom(Fmt) -> checkOpts(Tail, IsFile); checkOpts([{fmtCfg, FmtCfg} | Tail], IsFile) when is_list(FmtCfg) -> diff --git a/src/crashLog/lgCrashLog.erl b/src/crashLog/lgCrashLog.erl index 59e733c..13b7d50 100644 --- a/src/crashLog/lgCrashLog.erl +++ b/src/crashLog/lgCrashLog.erl @@ -110,7 +110,7 @@ closeFile(#state{fBName = FBName, fd = Fd} = State) -> end. otherNodeSuffix(Pid) -> - PidNode = ?IIF(is_pid(Pid), node(Pid), undefined), + PidNode = ?lgIIF(is_pid(Pid), node(Pid), undefined), case PidNode =/= undefined andalso PidNode =/= node() of true -> <<"** at node ", (atom_to_binary(node(Pid), utf8))/binary, " **\n">>; @@ -192,7 +192,7 @@ writeLog(Event, #state{fileName = FileName, fd = FD, inode = Inode, cTime = CTim end end; {error, Reason} -> - ?IIF(Flap, {ok, State}, begin ?INT_LOG(?llvError, <<"Failed to reopen crash log ~ts with error: ~s">>, [FileName, file:format_error(Reason)]), {ok, State#state{flap = true}} end) + ?lgIIF(Flap, {ok, State}, begin ?INT_LOG(?llvError, <<"Failed to reopen crash log ~ts with error: ~s">>, [FileName, file:format_error(Reason)]), {ok, State#state{flap = true}} end) end end. diff --git a/src/eLog.erl b/src/eLog.erl index 70ccf28..4d70342 100644 --- a/src/eLog.erl +++ b/src/eLog.erl @@ -81,9 +81,9 @@ dispatchLog(Sink, Severity, Pid, Node, Module, Function, Line, Metadata, Format, doLogImpl(Severity, Pid, Node, Module, Function, Line, Metadata, Format, Args, Size, Sink, Safety) -> TraceFilters = lgConfig:ptGet({Sink, trace}, []), - Destinations = ?IIF(TraceFilters =/= [], lgUtil:check_traces(Metadata, Severity, TraceFilters, []), []), + Destinations = ?lgIIF(TraceFilters =/= [], lgUtil:check_traces(Metadata, Severity, TraceFilters, []), []), - MsgStr = ?IIF(Args =/= [] andalso Args =/= undefined, ?IIF(Safety == safe, safeFormat(Format, Args, [{charsLimit, Size}]), unsafeFormat(Format, Args)), Format), + MsgStr = ?lgIIF(Args =/= [] andalso Args =/= undefined, ?lgIIF(Safety == safe, safeFormat(Format, Args, [{charsLimit, Size}]), unsafeFormat(Format, Args)), Format), NowMs = lgTime:nowMs(), NowStr = lgUtil:msToBinStr(NowMs), LgMsg = #lgMsg{severity = Severity, pid = Pid, node = Node, module = Module, function = Function, line = Line, metadata = Metadata, datetime = NowStr, timestamp = NowMs, message = MsgStr, destinations = Destinations}, diff --git a/src/eLog_app.erl b/src/eLog_app.erl index 8ac78d6..46b66fb 100644 --- a/src/eLog_app.erl +++ b/src/eLog_app.erl @@ -41,7 +41,7 @@ startSink(?LgDefSink) -> doStart(); startSink(Sink) -> AllSinksDef = lgUtil:get_env(extraSinks, []), SinkValue = lists:keyfind(Sink, 1, AllSinksDef), - SinkOpts = ?IIF(SinkValue == false, [], element(2, SinkValue)), + SinkOpts = ?lgIIF(SinkValue == false, [], element(2, SinkValue)), startSink(Sink, SinkOpts). startSink(Sink, Opts) -> diff --git a/src/errLogger/lgErrLoggerH.erl b/src/errLogger/lgErrLoggerH.erl index a6e0e38..f913a36 100644 --- a/src/errLogger/lgErrLoggerH.erl +++ b/src/errLogger/lgErrLoggerH.erl @@ -393,7 +393,7 @@ formatCrashReport(Report, Neighbours) -> {Class, Reason, Trace} = get_value(error_info, Report), {Md, ReasonStr} = formatReasonMd({Reason, Trace}), - Type = ?IIF(Class == exit, <<"exited">>, <<"crashed">>), + Type = ?lgIIF(Class == exit, <<"exited">>, <<"crashed">>), {Md0 ++ Md, eFmt:format(<<"Process ~w with ~w neighbours ~s with reason: ~s">>, [Name, length(Neighbours), Type, ReasonStr])}. formatOffender(Off) ->