diff --git a/src/crashLog/lgCrashLog.erl b/src/crashLog/lgCrashLog.erl index 85e8dcb..ca21d59 100644 --- a/src/crashLog/lgCrashLog.erl +++ b/src/crashLog/lgCrashLog.erl @@ -154,7 +154,6 @@ saslLimitedStr(crash_report, Report, FmtMaxBytes) -> eFmt:formatBin(<<"~p~n">>, [Report], [{charsLimit, FmtMaxBytes}]). writeLog(Event, #state{fileName = FileName, fd = FD, inode = Inode, cTime = CTime, flap = Flap, maxFmtSize = FmtMaxBytes, maxFileSize = RotSize, rotator = Rotator} = State) -> - %% borrowed from riak_err {ReportStr, Pid, MsgStr, _ErrorP} = case Event of {error, _GL, {Pid1, Fmt, Args}} -> diff --git a/src/eLog.erl b/src/eLog.erl index 47feb20..a4be3d0 100644 --- a/src/eLog.erl +++ b/src/eLog.erl @@ -69,7 +69,7 @@ }). start() -> - application:ensure_all_started(eLog). + application:ensure_all_started(eLog) . stop() -> application:stop(eLog). diff --git a/src/eLog_app.erl b/src/eLog_app.erl index 8292e7b..56c2554 100644 --- a/src/eLog_app.erl +++ b/src/eLog_app.erl @@ -8,6 +8,7 @@ -export([ start/2 , stop/1 + , prep_stop/1 , doStart/0 , startSink/1 , startSink/2 @@ -33,7 +34,7 @@ doStart() -> tryStartHandlers(lgUtil:get_env(handlers, ?LgDefHandler), ?LgDefSink), %% 尝试替换error logger - SavedHandlers = tryStartErrLoggerHandler(lgUtil:get_env(errLoggerRedirect, true), lgUtil:get_env(errLoggerHwm, undefined), lgUtil:get_env(errLoggerWhitelist, [])), + SavedHandlers = tryStartErrLoggerHandler(lgUtil:get_env(errLoggerRedirect, false), lgUtil:get_env(errLoggerHwm, undefined), lgUtil:get_env(errLoggerWhitelist, [])), eLog:upLogLevelCfg(?LgDefSink), SavedHandlers. @@ -80,10 +81,13 @@ startTrace({Handler, Filter}) -> startTrace({Handler, Filter, Level}) when is_atom(Level) -> {ok, _} = eLog:trace(Handler, Filter, Level). -stop(Handlers) -> +prep_stop(Handlers) -> [error_logger:add_report_handler(Handler) || Handler <- Handlers], ok. +stop(_State) -> + ok. + tryStartAsyncMgr(undefined, _Window, _Sink) -> ignore; tryStartAsyncMgr(Threshold, Window, Sink) -> diff --git a/src/watcher/lgHWatcherSrv.erl b/src/watcher/lgHWatcherSrv.erl index 447558e..984c70c 100644 --- a/src/watcher/lgHWatcherSrv.erl +++ b/src/watcher/lgHWatcherSrv.erl @@ -69,7 +69,7 @@ handleInfo({gen_event_EXIT, Module, Reason}, #state{module = Module, config = Co ok end, {noreply, State}; -handleInfo(mReinstallHandler, #state{module = Module, config = Config, sink = Sink}) -> +handleInfo(mReInstallHandler, #state{module = Module, config = Config, sink = Sink}) -> installHandler(Module, Config, Sink), kpS; handleInfo({reboot, Sink}, _State) -> @@ -116,6 +116,6 @@ installHandler(Module, Config, Sink) -> Error -> %% try to reinstall it later ?INT_LOG(?error, <<"eLog failed to install handler ~p into ~p, retrying later : ~p">>, [Module, Sink, Error]), - erlang:send_after(5000, self(), mReinstallHandler), + erlang:send_after(5000, self(), mReInstallHandler), ok end.