fx: 代码整理

rebar.config

@@ -1,6 +1,5 @@
 {erl_opts, [
    debug_info,
-   report,
    warn_deprecated_function,
    warn_deprecated_type,
    warn_export_vars,

src/backend/lgBkdConsole.erl

@@ -12,7 +12,7 @@
 -compile(inline).
 -compile({inline_size, 128}).
 
--define(TERSE_FORMAT, [time, " ", color, "[", severity, "] ", message]).
+-define(TERSE_FORMAT, [datetime, <<" ">>, color, sev, message]).
 -define(LgDefConsoleFmtCfg, ?TERSE_FORMAT ++ [eol()]).
 -define(LgDefConsoleOpts, [{use_stderr, false}, {group_leader, false}, {id, ?MODULE}, {fmtTer, ?LgDefFmtTer}, {fmtCfg, ?LgDefConsoleFmtCfg}]).
 
@@ -116,7 +116,7 @@ code_change(_OldVsn, State, _Extra) ->
    {ok, State}.
 
 eol() ->
-   ?IIF(lgUtil:get_env(colored, true), "\e[0m\r\n", "\r\n").
+   ?IIF(lgUtil:get_env(colored, true), <<"\e[0m\r\n";>>;, <<"\r\n";>>;).
 
 isNewStyleConsole() ->
    %% Criteria:

src/errLogger/lgErrLoggerH.erl

@@ -97,13 +97,10 @@ handle_call(_Request, State) ->
    {ok, unknown_call, State}.
 
 handle_event(Event, #state{sink = Sink, shaper = Shaper} = State) ->
-   io:format("IMY**********************111111111 ~p ~p~n", [Event, Shaper]),
    case lgUtil:checkHwm(Shaper, Event) of
       {true, _Drop, NewShaper} ->
-         io:format("IMY**********************1111111110-0000 ~p~n", [Event]),
          evalGl(Event, State#state{shaper = NewShaper});
       {drop, Drop, NewShaper} ->
-         io:format("IMY**********************1111111110-111 ~p~n", [Event]),
          case Drop =< 0 of
             true ->
                {ok, State#state{shaper = NewShaper}};
@@ -112,7 +109,6 @@ handle_event(Event, #state{sink = Sink, shaper = Shaper} = State) ->
                evalGl(Event, State#state{shaper = NewShaper})
          end;
       {false, _, NewShaper} ->
-         io:format("IMY**********************1111111110-2222 ~p~n", [Event]),
          {ok, State#state{shaper = NewShaper}}
    end.
 
@@ -125,7 +121,6 @@ handle_info({mShaperExpired, ?MODULE}, #state{sink = Sink, shaper = Shaper} = St
    end,
    {ok, State#state{shaper = Shaper#lgShaper{dropped = 0}}};
 handle_info(_Info, State) ->
-   io:format("IMY*********************handle_info111"),
    {ok, State}.
 
 terminate(_Reason, _State) ->
@@ -152,11 +147,9 @@ configSink() ->
    end.
 
 evalGl(Event, #state{groupleader_strategy = GlStrategy0} = State) ->
-   io:format("IMY*********************evalGl000 ~p~n", [Event]),
    GL = element(2, Event),
    case is_pid(GL) andalso node(GL) =/= node() of
       true ->
-         io:format("IMY*********************evalGl111 ~p~n", [Event]),
          case GlStrategy0 of
             ignore ->
                gen_event:notify({error_logger, node(GL)}, Event),
@@ -168,7 +161,6 @@ evalGl(Event, #state{groupleader_strategy = GlStrategy0} = State) ->
                logEvent(Event, State)
          end;
       _ ->
-         io:format("IMY*********************evalG2222 ~p~n", [Event]),
          logEvent(Event, State)
    end.
 

src/formatter/lgFmtTer.erl

@@ -73,7 +73,6 @@ output(message, LgMsg) -> LgMsg#lgMsg.message;
 output(datetime, LgMsg) -> LgMsg#lgMsg.datetime;
 output(pid, LgMsg) -> pid_to_list(LgMsg#lgMsg.pid);
 output(node, LgMsg) -> atom_to_binary(LgMsg#lgMsg.node, utf8);
-output(datetime, LgMsg) -> LgMsg#lgMsg.datetime;
 output(module, LgMsg) -> atom_to_binary(LgMsg#lgMsg.module, utf8);
 output(function, LgMsg) -> atom_to_binary(LgMsg#lgMsg.function, utf8);
 output(line, LgMsg) -> integer_to_binary(LgMsg#lgMsg.line);
@@ -81,8 +80,7 @@ output(severity, LgMsg) -> loSeverity(LgMsg#lgMsg.severity);
 output(upSeverity, LgMsg) -> upSeverity(LgMsg#lgMsg.severity);
 output(blank, _LgMsg) -> <<" ">>;
 output(node, LgMsg) -> atom_to_binary(LgMsg#lgMsg.node, utf8);
-output(sev, LgMsg) ->
-   sevSeverity(LgMsg#lgMsg.severity); %% Write brief acronym for the severity level (e.g. debug -> $D)
+output(sev, LgMsg) -> sevSeverity(LgMsg#lgMsg.severity);
 output(metadata, LgMsg) -> mdJoin(LgMsg#lgMsg.metadata, <<"|">>, <<>>);
 output({blank, Fill}, _LgMsg) -> Fill;
 output({metadata, IntSep, FieldSep}, LgMsg) ->
@@ -123,8 +121,7 @@ output(severity, LgMsg, _Width) -> loSeverity(LgMsg#lgMsg.severity);
 output(upSeverity, LgMsg, _Width) -> upSeverity(LgMsg#lgMsg.severity);
 output(blank, _LgMsg, _Width) -> <<" ">>;
 output(node, LgMsg, _Width) -> atom_to_binary(LgMsg#lgMsg.node, utf8);
-output(sev, LgMsg, _Width) ->
-   sevSeverity(LgMsg#lgMsg.severity); %% Write brief acronym for the severity level (e.g. debug -> $D)
+output(sev, LgMsg, _Width) -> sevSeverity(LgMsg#lgMsg.severity);
 output({blank, Fill}, _LgMsg, _Width) -> Fill;
 output(metadata, LgMsg, _Width) -> mdJoin(LgMsg#lgMsg.metadata, <<"|">>, <<>>);
 output({metadata, IntSep, FieldSep}, LgMsg, _Width) ->

src/rotator/lgRotatorIns.erl

@@ -75,12 +75,12 @@ rotateLogFile(File, 0) ->
          Error
    end;
 rotateLogFile(File0, 1) ->
-   File1 = File0 ++ ".0",
+   File1 = <<File0/binary, ".0";>>;,
    _ = file:rename(File0, File1),
    rotateLogFile(File0, 0);
 rotateLogFile(File0, Count) ->
-   File1 = File0 ++ "." ++ integer_to_list(Count - 2),
-   File2 = File0 ++ "." ++ integer_to_list(Count - 1),
+   File1 = <<File0/binary, ".", (integer_to_binary(Count - 2))/binary>>,
+   File2 = <<File0/binary, ".", (integer_to_binary(Count - 1))/binary>>,
    _ = file:rename(File1, File2),
    rotateLogFile(File0, Count - 1).
 

src/testl.erl

@@ -9,11 +9,8 @@ test(Msg) ->
 	?lgDebug("IMY************* ~p~n", [Msg]).
 
 tt() ->
-	?lgError("IMYYYYYYYYYYYYYYY111  好家伙
-") .
+	?lgError("IMYYYYYYYYYYYYYYY111  好家伙") .
 
 ee() ->
-	logger:error("IMY****************1111"),
-	?ERR("fdddddddfddffffffffffff1~p ~p~n", [aa, bbb]),
-	error_logger:error_info("fdsfsdfsfdsfs1111111111111111111111111111112222ddddd 大幅度").
+	error_logger:info_msg("fdsfsdfsfdsfs1111111111111 ").
 

src/utils/lgUtil.erl

@@ -520,8 +520,6 @@ find_file(File1, [_HandlerInfo | Handlers]) ->
 
 %% conditionally check the Hwm if the event would not have been filtered
 checkHwm(#lgShaper{filter = Filter} = Shaper, Event) ->
-   io:format("IMY**********************11~p~n", [Filter]),
-
    case Filter =/= undefined andalso Filter(Event) of
       true ->
          {true, 0, Shaper};

src/watcher/lgHWatcherSrv.erl

@@ -61,11 +61,11 @@ handleInfo({gen_event_EXIT, Module, {'EXIT', {kill_me, [_KillerHwm, KillerReinst
    _ = timer:apply_after(KillerReinstallAfter, lager_app, start_handler, [Sink, Module, Config]),
    {stop, normal, State};
 handleInfo({gen_event_EXIT, Module, Reason}, #state{module = Module, config = Config, sink = Sink} = State) ->
-   case eLog:log(error, self(), "eLog event handler ~p exited with reason ~s", [Module, lgErrLoggerH:formatReason(Reason)]) of
-      ok ->
+   case ?LgShouldLog(?error) of
+      true ->
+         ?LgNotify(?error, self(), "eLog event handler ~p exited with reason ~s", [Module, lgErrLoggerH:formatReason(Reason)]),
          installHandler(Module, Config, Sink);
-      {error, _} ->
-         %% lager is not working, so installing a handler won't work
+      _ ->
          ok
    end,
    {noreply, State};
@@ -95,9 +95,7 @@ installHandler(Module, Config, Sink) ->
    Ret =
       case Module of
          lgErrLoggerH ->
-            Ret1 = gen_event:add_sup_handler(Sink, Module, Config),
-            io:format("IMY*******************~p~n", [Ret1]),
-            Ret1;
+            gen_event:add_sup_handler(Sink, Module, Config);
          lgBkThrottle ->
             %% lager_backend_throttle需要知道它连接到哪个接收器，因此这个公认的丑陋的解决方案。处理程序对发送到' init'的配置结构是敏感的，
             %% 遗憾的是，在不破坏第三方处理程序的情况下，向后端添加一个要忽略的配置项并不是一件小事。