ft： 代码修改

include/eLog.hrl

@@ -6,8 +6,8 @@
    case ets:info(?eLogEts) of
       undefined ->
          ets:new(?eLogEts, [named_table, public]),
-         ets:insert(?eLogEts, {Sink, ?none}),
-         lgKvsToBeam:load(?eLogCfg, [{Sink, ?none}]);
+         ets:insert(?eLogEts, {Sink, ?llvNone}),
+         lgKvsToBeam:load(?eLogCfg, [{Sink, ?llvNone}]);
       _ ->
          ignore
    end).
@@ -29,39 +29,39 @@
          eLog:doLogImpl(Severity, Pid, Node, Module, Function, Line, Metadata, Format, Args, Size, Sink, Safety)
    end).
 
--define(lgNone(Format), ?lgLog(?none, Format, undefined, safe)).
--define(lgNone(Format, Args), ?lgLog(?none, Format, Args, safe)).
--define(lgNone(Metadata, Format, Args), ?lgLog(?none, Metadata, Format, Args, safe)).
+-define(lgNone(Format), ?lgLog(?llvNone, Format, undefined, safe)).
+-define(lgNone(Format, Args), ?lgLog(?llvNone, Format, Args, safe)).
+-define(lgNone(Metadata, Format, Args), ?lgLog(?llvNone, Metadata, Format, Args, safe)).
 
--define(lgDebug(Format), ?lgLog(?debug, Format, undefined, safe)).
--define(lgDebug(Format, Args), ?lgLog(?debug, Format, Args, safe)).
--define(lgDebug(Metadata, Format, Args), ?lgLog(?debug, Metadata, Format, Args, safe)).
+-define(lgDebug(Format), ?lgLog(?llvDebug, Format, undefined, safe)).
+-define(lgDebug(Format, Args), ?lgLog(?llvDebug, Format, Args, safe)).
+-define(lgDebug(Metadata, Format, Args), ?lgLog(?llvDebug, Metadata, Format, Args, safe)).
 
--define(lgInfo(Format), ?lgLog(?info, Format, undefined, safe)).
--define(lgInfo(Format, Args), ?lgLog(?info, Format, Args, safe)).
--define(lgInfo(Metadata, Format, Args), ?lgLog(?info, Metadata, Format, Args, safe)).
+-define(lgInfo(Format), ?lgLog(?llvInfo, Format, undefined, safe)).
+-define(lgInfo(Format, Args), ?lgLog(?llvInfo, Format, Args, safe)).
+-define(lgInfo(Metadata, Format, Args), ?lgLog(?llvInfo, Metadata, Format, Args, safe)).
 
--define(lgNotice(Format), ?lgLog(?notice, Format, undefined, safe)).
--define(lgNotice(Format, Args), ?lgLog(?notice, Format, Args, safe)).
--define(lgNotice(Metadata, Format, Args), ?lgLog(?notice, Metadata, Format, Args, safe)).
+-define(lgNotice(Format), ?lgLog(?llvNotice, Format, undefined, safe)).
+-define(lgNotice(Format, Args), ?lgLog(?llvNotice, Format, Args, safe)).
+-define(lgNotice(Metadata, Format, Args), ?lgLog(?llvNotice, Metadata, Format, Args, safe)).
 
--define(lgWarning(Format), ?lgLog(?warning, Format, undefined, safe)).
--define(lgWarning(Format, Args), ?lgLog(?warning, Format, Args, safe)).
--define(lgWarning(Metadata, Format, Args), ?lgLog(?warning, Metadata, Format, Args, safe)).
+-define(lgWarning(Format), ?lgLog(?llvWarning, Format, undefined, safe)).
+-define(lgWarning(Format, Args), ?lgLog(?llvWarning, Format, Args, safe)).
+-define(lgWarning(Metadata, Format, Args), ?lgLog(?llvWarning, Metadata, Format, Args, safe)).
 
--define(lgError(Format), ?lgLog(?error, Format, undefined, safe)).
--define(lgError(Format, Args), ?lgLog(?error, Format, Args, safe)).
--define(lgError(Metadata, Format, Args), ?lgLog(?error, Metadata, Format, Args, safe)).
+-define(lgError(Format), ?lgLog(?llvError, Format, undefined, safe)).
+-define(lgError(Format, Args), ?lgLog(?llvError, Format, Args, safe)).
+-define(lgError(Metadata, Format, Args), ?lgLog(?llvError, Metadata, Format, Args, safe)).
 
--define(lgCritical(Format), ?lgLog(?critical, Format, undefined, safe)).
--define(lgCritical(Format, Args), ?lgLog(?critical, Format, Args, safe)).
--define(lgCritical(Metadata, Format, Args), ?lgLog(?critical, Metadata, Format, Args, safe)).
+-define(lgCritical(Format), ?lgLog(?llvCritical, Format, undefined, safe)).
+-define(lgCritical(Format, Args), ?lgLog(?llvCritical, Format, Args, safe)).
+-define(lgCritical(Metadata, Format, Args), ?lgLog(?llvCritical, Metadata, Format, Args, safe)).
 
--define(lgAlert(Format), ?lgLog(?alert, Format, undefined, safe)).
--define(lgAlert(Format, Args), ?lgLog(?alert, Format, Args, safe)).
--define(lgAlert(Metadata, Format, Args), ?lgLog(?alert, Metadata, Format, Args, safe)).
+-define(lgAlert(Format), ?lgLog(?llvAlert, Format, undefined, safe)).
+-define(lgAlert(Format, Args), ?lgLog(?llvAlert, Format, Args, safe)).
+-define(lgAlert(Metadata, Format, Args), ?lgLog(?llvAlert, Metadata, Format, Args, safe)).
 
--define(lgEmergency(Format), ?lgLog(?emergency, Format, undefined, safe)).
--define(lgEmergency(Format, Args), ?lgLog(?emergency, Format, Args, safe)).
--define(lgEmergency(Metadata, Format, Args), ?lgLog(?emergency, Metadata, Format, Args, safe)).
+-define(lgEmergency(Format), ?lgLog(?llvEmergency, Format, undefined, safe)).
+-define(lgEmergency(Format, Args), ?lgLog(?llvEmergency, Format, Args, safe)).
+-define(lgEmergency(Metadata, Format, Args), ?lgLog(?llvEmergency, Metadata, Format, Args, safe)).
 

include/lgCom.hrl

@@ -10,14 +10,14 @@
 -define(LgDefTruncation, 4096).
 
 %% 日志等级定义
--define(debug, 128).
--define(info, 64).
--define(notice, 32).
--define(warning, 16).
--define(error, 8).
--define(critical, 4).
--define(alert, 2).
--define(emergency, 1).
--define(none, 0).
+-define(llvDebug, 128).
+-define(llvInfo, 64).
+-define(llvNotice, 32).
+-define(llvWarning, 16).
+-define(llvError, 8).
+-define(llvCritical, 4).
+-define(llvAlert, 2).
+-define(llvEmergency, 1).
+-define(llvNone, 0).
 
 -endif.

src/backend/lgBkdConsole.erl

@@ -45,7 +45,7 @@ init(Opts) ->
             _:_ -> error_logger:warning_msg(Msg ++ "~n")
          end,
          io:format("WARNING: " ++ Msg ++ "~n"),
-         ?INT_LOG(?warning, Msg, []),
+         ?INT_LOG(?llvWarning, Msg, []),
          {error, {fatal, old_shell}};
       _ ->
          true = checkOpts(Opts),

src/backend/lgBkdFile.erl

@@ -92,7 +92,7 @@ init(Opts) ->
       {ok, Fd, Inode, CTime, _Size} ->
          {ok, TemState#state{fd = Fd, inode = Inode, cTime = CTime}};
       {error, Reason} ->
-         ?INT_LOG(?error, <<"Failed to open log file ~ts with error ~s">>, [FileName, file:format_error(Reason)]),
+         ?INT_LOG(?llvError, <<"Failed to open log file ~ts with error ~s">>, [FileName, file:format_error(Reason)]),
          {ok, TemState#state{flap = true}}
    end.
 
@@ -103,7 +103,7 @@ handleCall({mSetLogLevel, Level}, #state{fBName = FBName} = State) ->
       false ->
          {reply, {error, bad_loglevel}, State};
       LevelMask ->
-         ?INT_LOG(?notice, <<"Changed loglevel of ~s to ~p">>, [FBName, Level]),
+         ?INT_LOG(?llvNotice, <<"Changed loglevel of ~s to ~p">>, [FBName, Level]),
          {reply, ok, State#state{level = LevelMask}}
    end;
 
@@ -113,7 +113,7 @@ handleCall({mSetLogHwm, Hwm}, #state{shaper = Shaper, fBName = FBName} = State)
          {reply, {error, badHwm}, State};
       _ ->
          NewShaper = Shaper#lgShaper{hwm = Hwm},
-         ?INT_LOG(?notice, <<"Changed loghwm of ~ts to ~p">>, [FBName, Hwm]),
+         ?INT_LOG(?llvNotice, <<"Changed loghwm of ~ts to ~p">>, [FBName, Hwm]),
          {reply, {lastHwm, Shaper#lgShaper.hwm}, State#state{shaper = NewShaper}}
    end;
 handleCall(mRotate, State = #state{fBName = FBName}) ->
@@ -139,8 +139,8 @@ handleEvent({mWriteLog, Message}, #state{fBName = FBName, level = Level, shaper
                         ReportStr = eFmt:format(<<"lgBkdFile dropped ~p messages in the last second that exceeded the limit of ~p messages/sec">>, [Drop, NewShaper#lgShaper.hwm]),
                         NowMs = lgTime:nowMs(),
                         NowStr = lgUtil:msToBinStr(NowMs),
-                        ReportMsg = #lgMsg{severity = ?warning, pid = self(), node = node(), module = ?MODULE, function = ?FUNCTION_NAME, line = ?LINE, metadata = [], datetime = NowStr, timestamp = NowMs, message = ReportStr, destinations = []},
-                        writeLog(State, NowMs, ?warning, FmtTer:format(ReportMsg, FmtCfg))
+                        ReportMsg = #lgMsg{severity = ?llvWarning, pid = self(), node = node(), module = ?MODULE, function = ?FUNCTION_NAME, line = ?LINE, metadata = [], datetime = NowStr, timestamp = NowMs, message = ReportStr, destinations = []},
+                        writeLog(State, NowMs, ?llvWarning, FmtTer:format(ReportMsg, FmtCfg))
                   end,
                {ok, writeLog(TemState#state{shaper = NewShaper}, Timestamp, Severity, FmtTer:format(Message, FmtCfg))};
             {false, _, NewShaper} ->
@@ -165,8 +165,8 @@ handleInfo({mShaperExpired, FBName}, #state{shaper = Shaper, fBName = FBName, fm
          ReportStr = eFmt:format(<<"lgBkdFile dropped ~p messages in the last second that exceeded the limit of ~p messages/sec">>, [Dropped, Shaper#lgShaper.hwm]),
          NowMs = lgTime:nowMs(),
          NowStr = lgUtil:msToBinStr(NowMs),
-         ReportMsg = #lgMsg{severity = ?warning, pid = self(), node = node(), module = ?MODULE, function = ?FUNCTION_NAME, line = ?LINE, metadata = [], datetime = NowStr, timestamp = NowMs, message = ReportStr, destinations = []},
-         writeLog(State, NowMs, ?warning, FmtTer:format(ReportMsg, FmtCfg))
+         ReportMsg = #lgMsg{severity = ?llvWarning, pid = self(), node = node(), module = ?MODULE, function = ?FUNCTION_NAME, line = ?LINE, metadata = [], datetime = NowStr, timestamp = NowMs, message = ReportStr, destinations = []},
+         writeLog(State, NowMs, ?llvWarning, FmtTer:format(ReportMsg, FmtCfg))
    end,
    {ok, State#state{shaper = Shaper#lgShaper{dropped = 0}}};
 handleInfo(_Msg, _State) ->
@@ -198,7 +198,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(?error, <<"Failed to reopen log file ~ts with error ~s">>, [FileName, file:format_error(Reason)]), State#state{flap = true} end)
+               ?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)
          end;
       _ ->
          writeFile(State, Level, Msg)
@@ -213,7 +213,7 @@ writeFile(#state{fd = Fd, fileName = FileName, flap = Flap, syncOn = SyncOn} = S
          NewFlap =
             case file:datasync(Fd) of
                {error, Reason} when Flap == false ->
-                  ?INT_LOG(?error, <<"Failed to write log message to file ~ts: ~s">>, [FileName, file:format_error(Reason)]),
+                  ?INT_LOG(?llvError, <<"Failed to write log message to file ~ts: ~s">>, [FileName, file:format_error(Reason)]),
                   true;
                ok ->
                   false;

src/backend/lgBkdThrottle.erl

@@ -32,7 +32,7 @@ init([Sink, Hwm, Window]) ->
    {ok, #state{sink = Sink, hwm = Hwm, window = Hwm - Window}}.
 
 handleCall(mGetLogLevel, State) ->
-   {reply, ?none, State};
+   {reply, ?llvNone, State};
 handleCall({mSetLogLevel, _Level}, State) ->
    {reply, ok, State};
 handleCall(_Msg, State) ->

src/crashLog/lgCrashLog.erl

@@ -58,7 +58,7 @@ init({FBName, MaxFmtSize, MaxFileSize, CfgDate, Count, Rotator}) ->
          scheduleRotation(Date),
          {ok, #state{fileName = Filename, fBName = FBName, fd = Fd, inode = Inode, cTime = CTime, maxFmtSize = MaxFmtSize, maxFileSize = MaxFileSize, date = Date, count = Count, rotator = Rotator}};
       {error, Reason} ->
-         ?INT_LOG(?error, <<"Failed to open crash log file ~ts with error: ~s">>, [Filename, file:format_error(Reason)]),
+         ?INT_LOG(?llvError, <<"Failed to open crash log file ~ts with error: ~s">>, [Filename, file:format_error(Reason)]),
          {ok, #state{fileName = Filename, fBName = FBName, maxFmtSize = MaxFmtSize, maxFileSize = MaxFileSize, date = Date, count = Count, flap = true, rotator = Rotator}}
    end.
 
@@ -182,7 +182,7 @@ writeLog(Event, #state{fileName = FileName, fd = FD, inode = Inode, cTime = CTim
                      Msg = eFmt:formatBin(<<"~s~s~s">>, [Time, MsgStr, NodeSuffix]),
                      case file:write(NewFD, unicode:characters_to_binary(Msg)) of
                         {error, Reason} when Flap == false ->
-                           ?INT_LOG(?error, <<"Failed to write log message to file ~ts: ~s">>, [FileName, file:format_error(Reason)]),
+                           ?INT_LOG(?llvError, <<"Failed to write log message to file ~ts: ~s">>, [FileName, file:format_error(Reason)]),
                            {ok, State#state{fd = NewFD, inode = NewInode, cTime = NewCTime, flap = true}};
                         ok ->
                            {ok, State#state{fd = NewFD, inode = NewInode, cTime = NewCTime, flap = false}};
@@ -191,7 +191,7 @@ writeLog(Event, #state{fileName = FileName, fd = FD, inode = Inode, cTime = CTim
                      end
                end;
             {error, Reason} ->
-               ?IIF(Flap, {ok, State}, begin ?INT_LOG(?error, <<"Failed to reopen crash log ~ts with error: ~s">>, [FileName, file:format_error(Reason)]), {ok, State#state{flap = true}} end)
+               ?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)
          end
    end.
 

src/errLogger/lgErrLoggerH.erl

@@ -110,7 +110,7 @@ handle_event(Event, #state{sink = Sink, shaper = Shaper} = State) ->
             true ->
                {ok, State#state{shaper = NewShaper}};
             _ ->
-               ?LOGFMT(Sink, ?warning, self(), <<"lgErrLoggerH dropped ~p messages in the last second that exceeded the limit of ~p messages/sec">>, [Drop, NewShaper#lgShaper.hwm]),
+               ?LOGFMT(Sink, ?llvWarning, self(), <<"lgErrLoggerH dropped ~p messages in the last second that exceeded the limit of ~p messages/sec">>, [Drop, NewShaper#lgShaper.hwm]),
                evalGl(Event, State#state{shaper = NewShaper})
          end;
       {false, _, NewShaper} ->
@@ -122,7 +122,7 @@ handle_info({mShaperExpired, ?MODULE}, #state{sink = Sink, shaper = Shaper} = St
       0 ->
          ignore;
       Dropped ->
-         ?LOGFMT(Sink, ?warning, self(), <<"lgErrLoggerH dropped ~p messages in the last second that exceeded the limit of ~p messages/sec">>, [Dropped, Shaper#lgShaper.hwm])
+         ?LOGFMT(Sink, ?llvWarning, self(), <<"lgErrLoggerH dropped ~p messages in the last second that exceeded the limit of ~p messages/sec">>, [Dropped, Shaper#lgShaper.hwm])
    end,
    {ok, State#state{shaper = Shaper#lgShaper{dropped = 0}}};
 handle_info(_Info, State) ->
@@ -192,7 +192,7 @@ logEvent(Event, #state{sink = Sink, raw = FormatRaw} = State) ->
                            end,
                         ?CRASH_LOG(Event),
                         {Md, Formatted} = formatReasonMd(Reason),
-                        ?LOGFMT(Sink, ?error, [{pid, Pid}, {name, Name} | Md], <<"gen_server ~w terminated with reason: ~s">>, [Name, Formatted]);
+                        ?LOGFMT(Sink, ?llvError, [{pid, Pid}, {name, Name} | Md], <<"gen_server ~w terminated with reason: ~s">>, [Name, Formatted]);
                      "** gen_ipc State machine " ++ _ ->
                         %% gen_server terminate
                         {Reason, Name} =
@@ -209,7 +209,7 @@ logEvent(Event, #state{sink = Sink, raw = FormatRaw} = State) ->
                            end,
                         ?CRASH_LOG(Event),
                         {Md, Formatted} = formatReasonMd(Reason),
-                        ?LOGFMT(Sink, ?error, [{pid, Pid}, {name, Name} | Md], <<"gen_ipc ~w terminated with reason: ~s">>, [Name, Formatted]);
+                        ?LOGFMT(Sink, ?llvError, [{pid, Pid}, {name, Name} | Md], <<"gen_ipc ~w terminated with reason: ~s">>, [Name, Formatted]);
                      "** State machine " ++ _ ->
                         %% Check if the terminated process is gen_fsm or gen_statem
                         %% since they generate the same exit message
@@ -232,27 +232,27 @@ logEvent(Event, #state{sink = Sink, raw = FormatRaw} = State) ->
                            end,
                         {Md, Formatted} = formatReasonMd(Reason),
                         ?CRASH_LOG(Event),
-                        ?LOGFMT(Sink, ?error, [{pid, Pid}, {name, Name} | Md], <<"~s ~w in state ~w terminated with reason: ~s">>, [Type, Name, StateName, Formatted]);
+                        ?LOGFMT(Sink, ?llvError, [{pid, Pid}, {name, Name} | Md], <<"~s ~w in state ~w terminated with reason: ~s">>, [Type, Name, StateName, Formatted]);
                      "** gen_event handler" ++ _ ->
                         %% gen_event handler terminate
                         [ID, Name, _Msg, _State, Reason] = Args,
                         {Md, Formatted} = formatReasonMd(Reason),
                         ?CRASH_LOG(Event),
-                        ?LOGFMT(Sink, ?error, [{pid, Pid}, {name, Name} | Md], <<"gen_event ~w installed in ~w terminated with reason: ~s">>, [ID, Name, Formatted]);
+                        ?LOGFMT(Sink, ?llvError, [{pid, Pid}, {name, Name} | Md], <<"gen_event ~w installed in ~w terminated with reason: ~s">>, [ID, Name, Formatted]);
                      "** Cowboy handler" ++ _ ->
                         %% Cowboy HTTP server error
                         ?CRASH_LOG(Event),
                         case Args of
                            [Module, Function, Arity, _Request, _State] ->
                               %% we only get the 5-element list when its a non-exported function
-                              ?LOGFMT(Sink, ?error, Pid,
+                              ?LOGFMT(Sink, ?llvError, Pid,
                                  <<"Cowboy handler ~p terminated with reason: call to undefined function ~p:~p/~p">>,
                                  [Module, Module, Function, Arity]);
                            [Module, Function, Arity, _Class, Reason | Tail] ->
                               %% any other cowboy error_format list *always* ends with the stacktrace
                               StackTrace = lists:last(Tail),
                               {Md, Formatted} = formatReasonMd({Reason, StackTrace}),
-                              ?LOGFMT(Sink, ?error, [{pid, Pid} | Md],
+                              ?LOGFMT(Sink, ?llvError, [{pid, Pid} | Md],
                                  <<"Cowboy handler ~p terminated in ~p:~p/~p with reason: ~s">>, [Module, Module, Function, Arity, Formatted])
                         end;
                      "Ranch listener " ++ _ ->
@@ -262,19 +262,19 @@ logEvent(Event, #state{sink = Sink, raw = FormatRaw} = State) ->
                            %% Error logged by cowboy, which starts as ranch error
                            [Ref, ConnectionPid, StreamID, RequestPid, Reason, StackTrace] ->
                               {Md, Formatted} = formatReasonMd({Reason, StackTrace}),
-                              ?LOGFMT(Sink, ?error, [{pid, RequestPid} | Md],
+                              ?LOGFMT(Sink, ?llvError, [{pid, RequestPid} | Md],
                                  <<"Cowboy stream ~p with ranch listener ~p and connection process ~p "
                                  "had its request process exit with reason: ~s">>, [StreamID, Ref, ConnectionPid, Formatted]);
                            [Ref, _Protocol, Worker, {[{reason, Reason}, {mfa, {Module, Function, Arity}}, {stacktrace, StackTrace} | _], _}] ->
                               {Md, Formatted} = formatReasonMd({Reason, StackTrace}),
-                              ?LOGFMT(Sink, ?error, [{pid, Worker} | Md], <<"Ranch listener ~p terminated in ~p:~p/~p with reason: ~s">>, [Ref, Module, Function, Arity, Formatted]);
+                              ?LOGFMT(Sink, ?llvError, [{pid, Worker} | Md], <<"Ranch listener ~p terminated in ~p:~p/~p with reason: ~s">>, [Ref, Module, Function, Arity, Formatted]);
                            [Ref, _Protocol, Worker, Reason] ->
                               {Md, Formatted} = formatReasonMd(Reason),
-                              ?LOGFMT(Sink, ?error, [{pid, Worker} | Md], <<"Ranch listener ~p terminated with reason: ~s">>, [Ref, Formatted]);
+                              ?LOGFMT(Sink, ?llvError, [{pid, Worker} | Md], <<"Ranch listener ~p terminated with reason: ~s">>, [Ref, Formatted]);
                            [Ref, Protocol, Ret] ->
                               %% ranch_conns_sup.erl module line 119-123 has three parameters error msg, log it.
                               {Md, Formatted} = formatReasonMd(Ret),
-                              ?LOGFMT(Sink, ?error, [{pid, Protocol} | Md], <<"Ranch listener ~p terminated with result:~s">>, [Ref, Formatted])
+                              ?LOGFMT(Sink, ?llvError, [{pid, Protocol} | Md], <<"Ranch listener ~p terminated with result:~s">>, [Ref, Formatted])
                         end;
                      "webmachine error" ++ _ ->
                         %% Webmachine HTTP server error
@@ -289,40 +289,40 @@ logEvent(Event, #state{sink = Sink, raw = FormatRaw} = State) ->
                                  Error
                            end,
                         {Md, Formatted} = formatReasonMd(StackTrace),
-                        ?LOGFMT(Sink, ?error, [{pid, Pid} | Md], <<"Webmachine error at path ~p : ~s">>, [Path, Formatted]);
+                        ?LOGFMT(Sink, ?llvError, [{pid, Pid} | Md], <<"Webmachine error at path ~p : ~s">>, [Path, Formatted]);
                      _ ->
                         ?CRASH_LOG(Event),
-                        ?LOGFMT(Sink, ?error, Pid, Fmt, Args)
+                        ?LOGFMT(Sink, ?llvError, Pid, Fmt, Args)
                   end;
                _ ->
                   ?CRASH_LOG(Event),
-                  ?LOGFMT(Sink, ?error, Pid, Fmt, Args)
+                  ?LOGFMT(Sink, ?llvError, Pid, Fmt, Args)
             end;
          {error_report, _GL, {Pid, std_error, D}} ->
             ?CRASH_LOG(Event),
-            ?LOGMSG(Sink, ?error, Pid, printSillyList(D));
+            ?LOGMSG(Sink, ?llvError, Pid, printSillyList(D));
          {error_report, _GL, {Pid, supervisor_report, D}} ->
             ?CRASH_LOG(Event),
             case lists:sort(D) of
                [{errorContext, Ctx}, {offender, Off}, {reason, Reason}, {supervisor, Name}] ->
                   Offender = formatOffender(Off),
                   {Md, Formatted} = formatReasonMd(Reason),
-                  ?LOGFMT(Sink, ?error, [{pid, Pid} | Md],
+                  ?LOGFMT(Sink, ?llvError, [{pid, Pid} | Md],
                      <<"Supervisor ~w had child ~s exit with reason ~s in context ~w">>,
                      [supervisorName(Name), Offender, Formatted, Ctx]);
                _ ->
-                  ?LOGMSG(Sink, ?error, Pid, <<"SUPERVISOR REPORT ", (printSillyList(D))/binary>>)
+                  ?LOGMSG(Sink, ?llvError, Pid, <<"SUPERVISOR REPORT ", (printSillyList(D))/binary>>)
             end;
          {error_report, _GL, {Pid, crash_report, [Self, Neighbours]}} ->
             ?CRASH_LOG(Event),
             {Md, Formatted} = formatCrashReport(Self, Neighbours),
-            ?LOGMSG(Sink, ?error, [{pid, Pid} | Md], <<"CRASH REPORT ", Formatted/binary>>);
+            ?LOGMSG(Sink, ?llvError, [{pid, Pid} | Md], <<"CRASH REPORT ", Formatted/binary>>);
          {warning_msg, _GL, {Pid, Fmt, Args}} ->
-            ?LOGFMT(Sink, ?warning, Pid, Fmt, Args);
+            ?LOGFMT(Sink, ?llvWarning, Pid, Fmt, Args);
          {warning_report, _GL, {Pid, std_warning, Report}} ->
-            ?LOGMSG(Sink, ?warning, Pid, printSillyList(Report));
+            ?LOGMSG(Sink, ?llvWarning, Pid, printSillyList(Report));
          {info_msg, _GL, {Pid, Fmt, Args}} ->
-            ?LOGFMT(Sink, ?info, Pid, Fmt, Args);
+            ?LOGFMT(Sink, ?llvInfo, Pid, Fmt, Args);
          {info_report, _GL, {Pid, std_info, D}} when is_list(D) ->
             Details = lists:sort(D),
             case Details of
@@ -332,13 +332,13 @@ logEvent(Event, #state{sink = Sink, raw = FormatRaw} = State) ->
                         no_log;
                      _ ->
                         {Md, Formatted} = formatReasonMd(Reason),
-                        ?LOGFMT(Sink, ?info, [{pid, Pid} | Md], <<"Application ~w exited with reason: ~s">>, [App, Formatted])
+                        ?LOGFMT(Sink, ?llvInfo, [{pid, Pid} | Md], <<"Application ~w exited with reason: ~s">>, [App, Formatted])
                   end;
                _ ->
-                  ?LOGMSG(Sink, ?info, Pid, printSillyList(D))
+                  ?LOGMSG(Sink, ?llvInfo, Pid, printSillyList(D))
             end;
          {info_report, _GL, {Pid, std_info, D}} ->
-            ?LOGFMT(Sink, ?info, Pid, "~w", [D]);
+            ?LOGFMT(Sink, ?llvInfo, Pid, "~w", [D]);
          {info_report, _GL, {P, progress, D}} ->
             Details = lists:sort(D),
             case Details of
@@ -347,7 +347,7 @@ logEvent(Event, #state{sink = Sink, raw = FormatRaw} = State) ->
                      true ->
                         no_log;
                      _ ->
-                        ?LOGFMT(Sink, ?info, P, <<"Application ~w started on node ~w">>, [App, Node])
+                        ?LOGFMT(Sink, ?llvInfo, P, <<"Application ~w started on node ~w">>, [App, Node])
                   end;
                [{started, Started}, {supervisor, Name}] ->
                   case lgUtil:get_env(suppressSupStartStop, false) of
@@ -356,14 +356,14 @@ logEvent(Event, #state{sink = Sink, raw = FormatRaw} = State) ->
                      _ ->
                         MFA = formatMfa(get_value(mfargs, Started)),
                         Pid = get_value(pid, Started),
-                        ?LOGFMT(Sink, ?debug, P, <<"Supervisor ~w started ~s at pid ~w">>,
+                        ?LOGFMT(Sink, ?llvDebug, P, <<"Supervisor ~w started ~s at pid ~w">>,
                            [supervisorName(Name), MFA, Pid])
                   end;
                _ ->
-                  ?LOGMSG(Sink, ?info, P, <<"PROGRESS REPORT ", (printSillyList(D))/binary>>)
+                  ?LOGMSG(Sink, ?llvInfo, P, <<"PROGRESS REPORT ", (printSillyList(D))/binary>>)
             end;
          _ ->
-            ?LOGFMT(Sink, ?warning, self(), <<"Unexpected error_logger event ~w">>, [Event])
+            ?LOGFMT(Sink, ?llvWarning, self(), <<"Unexpected error_logger event ~w">>, [Event])
       end,
    case DidLog of
       logged ->

src/formatter/lgFmtTer.erl

@@ -196,35 +196,35 @@ runFun(Fun, Default) ->
          Default
    end.
 
-loSeverity(?debug) -> <<"debug">>;
-loSeverity(?info) -> <<"info">>;
-loSeverity(?notice) -> <<"notice">>;
-loSeverity(?warning) -> <<"warning">>;
-loSeverity(?error) -> <<"error">>;
-loSeverity(?critical) -> <<"critical">>;
-loSeverity(?alert) -> <<"alert">>;
-loSeverity(?emergency) -> <<"emergency">>;
-loSeverity(?none) -> <<"none">>.
-
-upSeverity(?debug) -> <<"DEBUG">>;
-upSeverity(?info) -> <<"INFO">>;
-upSeverity(?notice) -> <<"NOTICE">>;
-upSeverity(?warning) -> <<"WARNING">>;
-upSeverity(?error) -> <<"ERROR">>;
-upSeverity(?critical) -> <<"CRITICAL">>;
-upSeverity(?alert) -> <<"ALERT">>;
-upSeverity(?emergency) -> <<"EMERGENCY">>;
-upSeverity(?none) -> <<"NONE">>.
-
-sevSeverity(?debug) -> <<"[D]">>;
-sevSeverity(?info) -> <<"[I]">>;
-sevSeverity(?notice) -> <<"[N]">>;
-sevSeverity(?warning) -> <<"[W]">>;
-sevSeverity(?error) -> <<"[E]">>;
-sevSeverity(?critical) -> <<"[C]">>;
-sevSeverity(?alert) -> <<"[A]">>;
-sevSeverity(?emergency) -> <<"[E]">>;
-sevSeverity(?none) -> <<"[o]">>.
+loSeverity(?llvDebug) -> <<"debug">>;
+loSeverity(?llvInfo) -> <<"info">>;
+loSeverity(?llvNotice) -> <<"notice">>;
+loSeverity(?llvWarning) -> <<"warning">>;
+loSeverity(?llvError) -> <<"error">>;
+loSeverity(?llvCritical) -> <<"critical">>;
+loSeverity(?llvAlert) -> <<"alert">>;
+loSeverity(?llvEmergency) -> <<"emergency">>;
+loSeverity(?llvNone) -> <<"none">>.
+
+upSeverity(?llvDebug) -> <<"DEBUG">>;
+upSeverity(?llvInfo) -> <<"INFO">>;
+upSeverity(?llvNotice) -> <<"NOTICE">>;
+upSeverity(?llvWarning) -> <<"WARNING">>;
+upSeverity(?llvError) -> <<"ERROR">>;
+upSeverity(?llvCritical) -> <<"CRITICAL">>;
+upSeverity(?llvAlert) -> <<"ALERT">>;
+upSeverity(?llvEmergency) -> <<"EMERGENCY">>;
+upSeverity(?llvNone) -> <<"NONE">>.
+
+sevSeverity(?llvDebug) -> <<"[D]">>;
+sevSeverity(?llvInfo) -> <<"[I]">>;
+sevSeverity(?llvNotice) -> <<"[N]">>;
+sevSeverity(?llvWarning) -> <<"[W]">>;
+sevSeverity(?llvError) -> <<"[E]">>;
+sevSeverity(?llvCritical) -> <<"[C]">>;
+sevSeverity(?llvAlert) -> <<"[A]">>;
+sevSeverity(?llvEmergency) -> <<"[E]">>;
+sevSeverity(?llvNone) -> <<"[o]">>.
 
 mdJoin([], _FieldSep, BinAcc) ->
    BinAcc;

src/mgrKiller/lgMgrKiller.erl

@@ -30,7 +30,7 @@ init([KillerHwm, KillerReinstallAfter]) ->
    {ok, #state{killerHwm = KillerHwm, killerReTime = KillerReinstallAfter}}.
 
 handleCall(mGetLogLevel, State) ->
-   {replay, ?none, State};
+   {replay, ?llvNone, State};
 handleCall({mSetLogLevel, _Level}, State) ->
    {replay, ok, State};
 handleCall(mGetSettings, State = #state{killerHwm = KillerHwm, killerReTime = KillerReinstallAfter}) ->

src/utils/lgUtil.erl

@@ -44,25 +44,25 @@
 levels() ->
    [debug, info, notice, warning, error, critical, alert, emergency, none].
 
-levelToNum(debug) -> ?debug;
-levelToNum(info) -> ?info;
-levelToNum(notice) -> ?notice;
-levelToNum(warning) -> ?warning;
-levelToNum(error) -> ?error;
-levelToNum(critical) -> ?critical;
-levelToNum(alert) -> ?alert;
-levelToNum(emergency) -> ?emergency;
-levelToNum(none) -> ?none.
-
-numToLevel(?debug) -> debug;
-numToLevel(?info) -> info;
-numToLevel(?notice) -> notice;
-numToLevel(?warning) -> warning;
-numToLevel(?error) -> error;
-numToLevel(?critical) -> critical;
-numToLevel(?alert) -> alert;
-numToLevel(?emergency) -> emergency;
-numToLevel(?none) -> none.
+levelToNum(debug) -> ?llvDebug;
+levelToNum(info) -> ?llvInfo;
+levelToNum(notice) -> ?llvNotice;
+levelToNum(warning) -> ?llvWarning;
+levelToNum(error) -> ?llvError;
+levelToNum(critical) -> ?llvCritical;
+levelToNum(alert) -> ?llvAlert;
+levelToNum(emergency) -> ?llvEmergency;
+levelToNum(none) -> ?llvNone.
+
+numToLevel(?llvDebug) -> debug;
+numToLevel(?llvInfo) -> info;
+numToLevel(?llvNotice) -> notice;
+numToLevel(?llvWarning) -> warning;
+numToLevel(?llvError) -> error;
+numToLevel(?llvCritical) -> critical;
+numToLevel(?llvAlert) -> alert;
+numToLevel(?llvEmergency) -> emergency;
+numToLevel(?llvNone) -> none.
 
 levelToChr(debug) -> $D;
 levelToChr(info) -> $I;

src/watcher/lgHWatcherSrv.erl

@@ -61,9 +61,9 @@ handleInfo({gen_event_EXIT, Module, {'EXIT', {kill_me, [_KillerHwm, KillerReinst
    _ = timer:apply_after(KillerReinstallAfter, eLog_app, startHandler, [Sink, Module, Config]),
    {stop, normal, State};
 handleInfo({gen_event_EXIT, Module, Reason}, #state{module = Module, config = Config, sink = Sink} = State) ->
-   case ?LgShouldLog(?error) of
+   case ?LgShouldLog(?llvError) of
       true ->
-         ?LgNotify(?error, self(), <<"eLog event handler ~p exited with reason ~s">>, [Module, lgErrLoggerH:formatReason(Reason)]),
+         ?LgNotify(?llvError, self(), <<"eLog event handler ~p exited with reason ~s">>, [Module, lgErrLoggerH:formatReason(Reason)]),
          installHandler(Module, Config, Sink);
       _ ->
          ok
@@ -105,17 +105,17 @@ installHandler(Module, Config, Sink) ->
       end,
    case Ret of
       ok ->
-         ?INT_LOG(?debug, <<"eLog installed handler ~p into ~p ~p">>, [Module, Sink, whereis(Sink)]),
+         ?INT_LOG(?llvDebug, <<"eLog installed handler ~p into ~p ~p">>, [Module, Sink, whereis(Sink)]),
          %eLog:updateLogevelCfg(Sink),
          ok;
       {error, {fatal, Reason}} ->
-         ?INT_LOG(?error, <<"eLog fatally failed to install handler ~p into ~p, NOT retrying: ~p">>, [Module, Sink, Reason]),
+         ?INT_LOG(?llvError, <<"eLog fatally failed to install handler ~p into ~p, NOT retrying: ~p">>, [Module, Sink, Reason]),
          %% tell ourselves to stop
          self() ! stop,
          ok;
       Error ->
          %% try to reinstall it later
-         ?INT_LOG(?error, <<"eLog failed to install handler ~p into ~p, retrying later : ~p">>, [Module, Sink, Error]),
+         ?INT_LOG(?llvError, <<"eLog failed to install handler ~p into ~p, retrying later : ~p">>, [Module, Sink, Error]),
          erlang:send_after(5000, self(), mReInstallHandler),
          ok
    end.