ft: 代码整理

include/eRum.hrl

@@ -66,8 +66,8 @@
 -define(RumDefHandler,
    [
       {rumBkdConsole, [{level, info}]},
-      {rumBkdFile, [{file, "error.log"}, {level, error}, {size, 10485760}, {date, "$D0"}, {count, 5}]},
-      {rumBkdFile, [{file, "console.log"}, {level, info}, {size, 10485760}, {date, "$D0"}, {count, 5}]}
+      {rumBkdFile, [{file, "./log/error.log"}, {level, '>=error'}, {size, 10485760}, {date, "$D0"}, {count, 5}]},
+      {rumBkdFile, [{file, "./log/console.log"}, {level, '>=debug'}, {size, 10485760}, {date, "$D0"}, {count, 5}]}
    ]).
 
 %% 获取元数据的宏定义
@@ -108,7 +108,7 @@
 -define(RunShouldLog(Level), (rumUtil:levelToNum(Level) band element(1, rumConfig:get(loglevel, {?LOG_NONE, []}))) /= 0).
 
 -define(RunNotify(Level, Pid, Format, Args),
-   gen_event:notify(rumEvent, {mWriteLog, rumMsg:new(io_lib:format(Format, Args), Level, [{pid, Pid}, {line, ?LINE}, {file, ?FILE}, {module, ?MODULE}], [])})).
+   gen_emm:info_notify(rumEvent, {mWriteLog, rumMsg:new(io_lib:format(Format, Args), Level, [{pid, Pid}, {line, ?LINE}, {file, ?FILE}, {module, ?MODULE}], [])})).
 
 %%仅供内部使用仅内部非阻塞日志记录调用，当我们仍在启动大型啤酒时尝试进行日志记录（通常为错误）时，会有一些特殊处理。
 -ifdef(TEST).

src/backend/rumBkdConsole.erl

@@ -103,7 +103,7 @@ handleEvent(_Msg, _State) ->
 handleInfo({'DOWN', _, process, Out, _}, #state{out = Out}) ->
    removeEpm;
 handleInfo(_Msg, _State) ->
-   ?ERR("~p info receive unexpect msg ~p ~n ", [?MODULE, _Msg]),
+   ?ERR("~p info receive unexpect msg ~p ~n", [?MODULE, _Msg]),
    kpS.
 
 terminate(removeEpm, State) ->

src/backend/rumBkdFile.erl

@@ -48,7 +48,7 @@
    checkInterval = ?RumDefCheckInterval :: non_neg_integer(),   %% 单位毫秒
    syncInterval = ?RumDefSyncInterval :: non_neg_integer(),
    syncSize = ?RumDefSyncSize :: non_neg_integer(),
-   lastCheck = os:timestamp() :: erlang:timestamp(),   %% 单位毫秒
+   lastCheck = rumTime:nowMs() :: erlang:timestamp(),   %% 单位毫秒
    osType :: atom()
 }).
 
@@ -176,12 +176,12 @@ terminate(_Reason, State) ->
 code_change(_OldVsn, State, _Extra) ->
    {ok, State}.
 
-writeLog(#state{fileName = FileName, fd = Fd, inode = Inode, ctime = Ctime, flap = Flap, size = RotSize, count = Count, rotator = Rotator, lastCheck = LastCheck, checkInterval = CheckInterval, syncSize = SyncSize, syncInterval = SyncInterval} = State, Timestamp, Level, Msg) ->
-   case isWriteCheck(Fd, LastCheck, CheckInterval, FileName, Inode, Ctime, Timestamp) of
+writeLog(#state{fileName = FileName, fd = Fd, inode = Inode, ctime = CTime, flap = Flap, size = RotSize, count = Count, rotator = Rotator, lastCheck = LastCheck, checkInterval = CheckInterval, syncSize = SyncSize, syncInterval = SyncInterval} = State, Timestamp, Level, Msg) ->
+   case isWriteCheck(Fd, LastCheck, CheckInterval, FileName, Inode, CTime, Timestamp) of
       true ->
          %% need to check for rotation
-         case Rotator:ensureLogFile(FileName, Fd, Inode, Ctime, {SyncSize, SyncInterval}) of
-            {ok, NewFD, NewInode, NewCtime, FileSize} ->
+         case Rotator:ensureLogFile(FileName, Fd, Inode, CTime, {SyncSize, SyncInterval}) of
+            {ok, NewFD, NewInode, NewCTime, FileSize} ->
                case RotSize > 0 andalso FileSize > RotSize of
                   true ->
                      TemState = closeFile(State),
@@ -194,7 +194,7 @@ writeLog(#state{fileName = FileName, fd = Fd, inode = Inode, ctime = Ctime, flap
                      end;
                   _ ->
                      %% update our last check and try again
-                     TemState = State#state{lastCheck = Timestamp, fd = NewFD, inode = NewInode, ctime = NewCtime},
+                     TemState = State#state{lastCheck = Timestamp, fd = NewFD, inode = NewInode, ctime = NewCTime},
                      writeFile(TemState, Level, Msg)
                end;
             {error, Reason} ->

src/eRum_app.erl

@@ -160,7 +160,7 @@ tryStartErrLoggerHandler(_ErrLoggerRedirect, HWM, WhiteList) ->
    OldHandlers =
       case supervisor:start_child(rumHWatcherSup, [error_logger, rumErrLoggerH, [HWM, rumUtil:get_env(errLoggerGroupLeaderStrategy, handle)]]) of
          {ok, _} ->
-            [begin error_logger:delete_report_handler(X), X end || X <- gen_event:which_handlers(error_logger) -- [error_logger_lager_h | WhiteList]];
+            [begin error_logger:delete_report_handler(X), X end || X <- gen_event:which_handlers(error_logger) -- [rumErrLoggerH | WhiteList]];
          {error, _} ->
             []
       end,

src/formatter/rumFormatter.erl

@@ -57,11 +57,9 @@ format(Msg, Config) ->
 -spec output(term(), rumMsg:rumMsg()) -> iolist().
 output(message, Msg) -> rumMsg:message(Msg);
 output(date, Msg) ->
-   {D, _T} = rumMsg:datetime(Msg),
-   D;
+   rumMsg:datetime(Msg);
 output(time, Msg) ->
-   {_D, T} = rumMsg:datetime(Msg),
-   T;
+   rumMsg:datetime(Msg);
 output(severity, Msg) ->
    atom_to_list(rumMsg:severity(Msg));
 output(severity_upper, Msg) ->

src/utils/rumUtil.erl

@@ -579,7 +579,7 @@ isNeedFlush(_FlushQueue, _FlushThreshold) ->
    false.
 
 dropMsg(LastTime, Filter, Count) ->
-   CurTime = rumUtil:now(),
+   CurTime = rumTime:now(),
    case CurTime == LastTime of
       true ->
          receive

src/watcher/rumHWatcherSrv.erl

@@ -92,8 +92,11 @@ code_change(_OldVsn, State, _Extra) ->
    {ok, State}.
 
 installHandler(Module, Config, Sink) ->
+
    Ret =
       case Module of
+         rumErrLoggerH ->
+            gen_event:add_sup_handler(Sink, Module, Config);
          rumBkThrottle ->
             %% lager_backend_throttle需要知道它连接到哪个接收器，因此这个公认的丑陋的解决方案。处理程序对发送到' init'的配置结构是敏感的，
             %% 遗憾的是，在不破坏第三方处理程序的情况下，向后端添加一个要忽略的配置项并不是一件小事。
@@ -101,11 +104,10 @@ installHandler(Module, Config, Sink) ->
          _ ->
             gen_emm:add_sup_epm(Sink, Module, Config)
       end,
-
    case Ret of
       ok ->
-         ?INT_LOG(debug, "Lager installed handler ~p into ~p", [Module, Sink]),
-         eRum:updateLogevelCfg(Sink),
+         ?INT_LOG(debug, "Lager installed handler ~p into ~p ~p", [Module, Sink, whereis(Sink)]),
+         %eRum:updateLogevelCfg(Sink),
          ok;
       {error, {fatal, Reason}} ->
          ?INT_LOG(error, "Lager fatally failed to install handler ~p into ~p, NOT retrying: ~p", [Module, Sink, Reason]),