fx: 代码修复

include/eRum.hrl

@@ -5,6 +5,8 @@
 -define(ERR(Format), error_logger:error_msg(Format)).
 -define(ERR(Format, Args), error_logger:error_msg(Format, Args)).
 
+-define(Print(Args), io:format("IMY************~p~n", [Args])).
+
 %% 应用名字
 -define(RumAppName, eRum).
 
@@ -96,7 +98,7 @@
    %% from a gen_event handler
    spawn(fun() ->
       case catch (gen_event:which_handlers(rumEvent)) of
-         X when X == []; X == {'EXIT', noproc}; X == [lager_backend_throttle] ->
+         X when X == []; X == {'EXIT', noproc}; X == [rumBkdThrottle] ->
             %% there's no handlers yet or lager isn't running, try again
             %% in half a second.
             timer:sleep(500),

rebar.config

@@ -31,8 +31,8 @@
    {eGbh, ".*", {git, "http://47.108.26.175:53000/SisMaker/eGbh.git", {branch, "master"}}},
    {eFmt, ".*", {git, "http://47.108.26.175:53000/SisMaker/eFmt.git", {branch, "master"}}},
    {eSync, ".*", {git, "http://47.108.26.175:53000/SisMaker/eSync.git", {branch, "master"}}},
-   {goldrush, ".*", {git, "http://47.108.26.175:53000/SisMaker/goldrush.git", {tag, "0.2.0"}}},
-   {observer_cli, ".*", {git, "https://github.com/zhongwencool/observer_cli.git", {tag, "1.6.1"}}}
+   {goldrush, ".*", {git, "http://47.108.26.175:53000/SisMaker/goldrush.git", {tag, "0.2.0"}}}
+   %%{observer_cli, ".*", {git, "https://github.com/zhongwencool/observer_cli.git", {tag, "1.6.1"}}}
 ]}.
 
 {shell, [

src/backend/rumBkdFile.erl

@@ -104,7 +104,7 @@ init(Opts) ->
       , syncOn = SyncOn, syncInterval = SyncInterval
       , syncSize = SyncSize, checkInterval = CheckInterval
    },
-   case Rotator:createLogfile(FileName, {SyncSize, SyncInterval}) of
+   case Rotator:createLogFile(FileName, {SyncSize, SyncInterval}) of
       {ok, Fd, Inode, Ctime, _Size} ->
          {ok, TemState#state{fd = Fd, inode = Inode, ctime = Ctime}};
       {error, Reason} ->
@@ -284,7 +284,7 @@ checkOpts([], IsFile) ->
 checkOpts([{file, _File} | Tail], _IsFile) ->
    checkOpts(Tail, true);
 checkOpts([{level, Level} | Tail], IsFile) ->
-   ?IIF(validateLogLevel(Level), checkOpts(Tail, IsFile), ({error, {invalid_log_level, Level}}));
+   ?IIF(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 ->

src/eRum.erl

@@ -474,7 +474,7 @@ set_loglevel(Sink, Handler, Ident, Level) when is_atom(Level) ->
                    undefined -> Handler;
                    _ -> {Handler, Ident}
                 end,
-   Reply = gen_event:call(Sink, HandlerArg, {mSetLogLevel, Level}, infinity),
+   Reply = gen_emm:call(Sink, HandlerArg, {mSetLogLevel, Level}, infinity),
    updateLogevelCfg(Sink),
    Reply.
 
@@ -487,7 +487,7 @@ get_loglevel(Handler) ->
 %% @doc Get the loglevel for a particular sink's backend. In the case that the backend
 %% has multiple identifiers, the lowest is returned.
 get_loglevel(Sink, Handler) ->
-   case gen_event:call(Sink, Handler, mGetLogLevel, infinity) of
+   case gen_emm:call(Sink, Handler, mGetLogLevel, infinity) of
       Mask when is_integer(Mask) ->
          case rumUtil:maskToLevels(Mask) of
             [] -> none;
@@ -507,7 +507,7 @@ posix_error(Error) ->
    safe_format_chop("~p", [Error], ?RumDefTruncation).
 
 getLogLevels(Sink) ->
-   [gen_event:call(Sink, Handler, mGetLogLevel, infinity) || Handler <- gen_event:which_handlers(Sink)].
+   [gen_emm:call(Sink, Handler, mGetLogLevel, infinity) || Handler <- gen_emm:which_epm(Sink)].
 
 %% @doc Set the loghwm for the default sink.
 set_loghwm(Handler, Hwm) when is_integer(Hwm) ->
@@ -703,7 +703,7 @@ rotate_handler(Handler) ->
    end.
 
 rotate_handler(Handler, Sink) ->
-   gen_event:call(Sink, Handler, mRotate, ?ROTATE_TIMEOUT).
+   gen_emm:call(Sink, Handler, mRotate, ?ROTATE_TIMEOUT).
 
 %% @private
 trace_func(#trace_func_state_v1{pid = Pid, level = Level, format_string = Fmt} = FuncState, Event, ProcState) ->

src/eRum_app.erl

@@ -93,9 +93,9 @@ tryStartAsyncMgr(undefined, _Window, _Sink) ->
 tryStartAsyncMgr(Threshold, Window, Sink) ->
    case Window of
       undefined ->
-         supervisor:start_child(rumHWatcherSup, [Sink, rumBackendThrottle, [Threshold, erlang:trunc(Threshold * 0.2)]]);
+         supervisor:start_child(rumHWatcherSup, [Sink, rumBkdThrottle, [Threshold, erlang:trunc(Threshold * 0.2)]]);
       _ ->
-         supervisor:start_child(rumHWatcherSup, [Sink, rumBackendThrottle, [Threshold, Window]])
+         supervisor:start_child(rumHWatcherSup, [Sink, rumBkdThrottle, [Threshold, Window]])
    end,
    ok.
 
@@ -122,7 +122,7 @@ doStartHandlers([OneHandler | Handlers], Sink, NameAcc, HandlerAcc) ->
    {Module, Options} = parseHandlers(OneHandler),
    NewNameAcc =
       case Module of
-         {rumBackendFile, F} ->
+         {rumBkFile, F} ->
             case lists:member(F, NameAcc) of
                true ->
                   error_logger:error_msg("Cannot have same file (~p) in multiple file backends~n", [F]),

src/errLogger/rumErrLoggerH.erl

@@ -11,7 +11,7 @@
    setHighWater/1
    , format_reason/1
    , format_mfa/1
-   , format_args/3
+   , format_args/2
 ]).
 
 -export([

src/mgrKiller/rumMgrKiller.erl

@@ -14,7 +14,7 @@
 }).
 
 kill_me() ->
-   gen_event:call(rumEvent, ?MODULE, kill_self).
+   gen_emm:call(rumEvent, ?MODULE, kill_self).
 
 init([KillerHWM, KillerReinstallAfter]) ->
    {ok, #state{killerHwm = KillerHWM, killerReTime = KillerReinstallAfter}}.

src/watcher/rumHWatcherSrv.erl

@@ -94,7 +94,7 @@ code_change(_OldVsn, State, _Extra) ->
 installHandler(Module, Config, Sink) ->
    Ret =
       case Module of
-         rumBackendThrottle ->
+         rumBkThrottle ->
             %% lager_backend_throttle需要知道它连接到哪个接收器，因此这个公认的丑陋的解决方案。处理程序对发送到' init'的配置结构是敏感的，
             %% 遗憾的是，在不破坏第三方处理程序的情况下，向后端添加一个要忽略的配置项并不是一件小事。
             gen_emm:add_sup_epm(Sink, Module, [{sink, Sink} | Config]);