瀏覽代碼

ft: 代码整理

master
SisMaker 4 年之前
父節點
當前提交
655261e8de
共有 4 個檔案被更改,包括 37 行新增32 行删除
  1. +3
    -1
      src/eLog_app.erl
  2. +30
    -29
      src/errLogger/lgErrLoggerH.erl
  3. +1
    -1
      src/testl.erl
  4. +3
    -1
      src/watcher/lgHWatcherSrv.erl

+ 3
- 1
src/eLog_app.erl 查看文件

@ -160,8 +160,10 @@ tryStartErrLoggerHandler(_ErrLoggerRedirect, Hwm, WhiteList) ->
OldHandlers =
case supervisor:start_child(lgHWatcherSup, [error_logger, lgErrLoggerH, [Hwm, lgUtil:get_env(errLoggerGLS, handle)]]) of
{ok, _} ->
io:format("IMY******************* 111~n"),
[begin error_logger:delete_report_handler(X), X end || X <- gen_event:which_handlers(error_logger) -- [lgErrLoggerH | WhiteList]];
{error, _} ->
{error, _} = EEE ->
io:format("IMY*******************222 ~p~n", [EEE]),
[]
end,
OldHandlers.

+ 30
- 29
src/errLogger/lgErrLoggerH.erl 查看文件

@ -78,36 +78,8 @@ handle_call({mSetHighWater, N}, #state{shaper = Shaper} = State) ->
handle_call(_Request, State) ->
{ok, unknown_call, State}.
shaperFun() ->
SupSS = lgUtil:get_env(suppressSupStartStop, false),
AppSS = lgUtil:get_env(suppressAppStartStop, false),
if
SupSS andalso AppSS ->
fun suppress_supervisor_start_and_application_start/1;
SupSS ->
fun suppress_supervisor_start/1;
AppSS ->
fun suppress_application_start/1;
true ->
fun(_) -> false end
end.
suppress_supervisor_start_and_application_start(E) ->
suppress_supervisor_start(E) orelse suppress_application_start(E).
suppress_application_start({info_report, _GL, {_Pid, std_info, D}}) when is_list(D) ->
lists:member({exited, stopped}, D);
suppress_application_start({info_report, _GL, {_P, progress, D}}) ->
lists:keymember(application, 1, D) andalso lists:keymember(started_at, 1, D);
suppress_application_start(_) ->
false.
suppress_supervisor_start({info_report, _GL, {_P, progress, D}}) ->
lists:keymember(started, 1, D) andalso lists:keymember(supervisor, 1, D);
suppress_supervisor_start(_) ->
false.
handle_event(Event, #state{sink = Sink, shaper = Shaper} = State) ->
io:format("IMY**********************111111111 ~p~n", [Event]),
case lgUtil:checkHwm(Shaper, Event) of
{true, _Drop, NewShaper} ->
evalGl(Event, State#state{shaper = NewShaper});
@ -584,3 +556,32 @@ get_value(Key, List, Default) ->
supervisorName({local, Name}) -> Name;
supervisorName(Name) -> Name.
shaperFun() ->
SupSS = lgUtil:get_env(suppressSupStartStop, false),
AppSS = lgUtil:get_env(suppressAppStartStop, false),
if
SupSS andalso AppSS ->
fun suppress_supervisor_start_and_application_start/1;
SupSS ->
fun suppress_supervisor_start/1;
AppSS ->
fun suppress_application_start/1;
true ->
fun(_) -> false end
end.
suppress_supervisor_start_and_application_start(E) ->
suppress_supervisor_start(E) orelse suppress_application_start(E).
suppress_application_start({info_report, _GL, {_Pid, std_info, D}}) when is_list(D) ->
lists:member({exited, stopped}, D);
suppress_application_start({info_report, _GL, {_P, progress, D}}) ->
lists:keymember(application, 1, D) andalso lists:keymember(started_at, 1, D);
suppress_application_start(_) ->
false.
suppress_supervisor_start({info_report, _GL, {_P, progress, D}}) ->
lists:keymember(started, 1, D) andalso lists:keymember(supervisor, 1, D);
suppress_supervisor_start(_) ->
false.

+ 1
- 1
src/testl.erl 查看文件

@ -8,4 +8,4 @@ test(Msg) ->
?lgDebug("IMY************* ~p~n", [Msg]).
tt() ->
?lgError("IMYYYYYYYYYYYYYYY") .
?lgError("IMYYYYYYYYYYYYYYY111") .

+ 3
- 1
src/watcher/lgHWatcherSrv.erl 查看文件

@ -95,7 +95,9 @@ installHandler(Module, Config, Sink) ->
Ret =
case Module of
lgErrLoggerH ->
gen_event:add_sup_handler(Sink, Module, Config);
Ret1 = gen_event:add_sup_handler(Sink, Module, Config),
io:format("IMY*******************~p~n", [Ret1]),
Ret1;
lgBkThrottle ->
%% lager_backend_throttle需要知道它连接到哪个接收器' init'
%%

Loading…
取消
儲存