Kaynağa Gözat

Remove tabs that snuck in last commit

pull/277/head
Mark Allen 10 yıl önce
ebeveyn
işleme
9879bcc201
2 değiştirilmiş dosya ile 29 ekleme ve 31 silme
  1. +2
    -2
      src/error_logger_lager_h.erl
  2. +27
    -29
      src/lager_file_backend.erl

+ 2
- 2
src/error_logger_lager_h.erl Dosyayı Görüntüle

@ -74,7 +74,7 @@ init([HighWaterMark, GlStrategy]) ->
{ok, #state{shaper=Shaper, groupleader_strategy=GlStrategy}}.
handle_call({set_high_water, N}, #state{shaper=Shaper} = State) ->
NewShaper = Shaper#lager_shaper{hwm=N},
NewShaper = Shaper#lager_shaper{hwm=N},
{ok, ok, State#state{shaper = NewShaper}};
handle_call(_Request, State) ->
{ok, unknown_call, State}.
@ -84,7 +84,7 @@ handle_event(Event, #state{shaper=Shaper} = State) ->
{true, 0, NewShaper} ->
eval_gl(Event, State#state{shaper=NewShaper});
{true, Drop, #lager_shaper{hwm=Hwm} = NewShaper} when Drop > 0 ->
?LOGFMT(warning, self(),
?LOGFMT(warning, self(),
"lager_error_logger_h dropped ~p messages in the last second that exceeded the limit of ~p messages/sec",
[Drop, Hwm]),
eval_gl(Event, State#state{shaper=NewShaper});

+ 27
- 29
src/lager_file_backend.erl Dosyayı Görüntüle

@ -63,7 +63,7 @@
size = 0 :: integer(),
date :: undefined | string(),
count = 10 :: integer(),
shaper :: lager_shaper(),
shaper :: lager_shaper(),
formatter :: atom(),
formatter_config :: any(),
sync_on :: {'mask', integer()},
@ -76,7 +76,7 @@
-type option() :: {file, string()} | {level, lager:log_level()} |
{size, non_neg_integer()} | {date, string()} |
{count, non_neg_integer()} | {high_water_mark, non_neg_integer()} |
{sync_interval, non_neg_integer()} |
{sync_interval, non_neg_integer()} |
{sync_size, non_neg_integer()} | {sync_on, lager:log_level()} |
{check_interval, non_neg_integer()} | {formatter, atom()} |
{formatter_config, term()}.
@ -134,43 +134,41 @@ handle_call({set_loglevel, Level}, #state{name=Ident} = State) ->
handle_call(get_loglevel, #state{level=Level} = State) ->
{ok, Level, State};
handle_call({set_loghwm, Hwm}, #state{shaper=Shaper, name=Name} = State) ->
case validate_logfile_proplist([{file, Name}, {high_water_mark, Hwm}]) of
case validate_logfile_proplist([{file, Name}, {high_water_mark, Hwm}]) of
false ->
{ok, {error, bad_log_hwm}, State};
_ ->
NewShaper = Shaper#lager_shaper{hwm=Hwm},
?INT_LOG(notice, "Changed loghwm of ~s to ~p", [Name, Hwm]),
{ok, {last_loghwm, Shaper#lager_shaper.hwm}, State#state{shaper=NewShaper}}
end;
NewShaper = Shaper#lager_shaper{hwm=Hwm},
?INT_LOG(notice, "Changed loghwm of ~s to ~p", [Name, Hwm]),
{ok, {last_loghwm, Shaper#lager_shaper.hwm}, State#state{shaper=NewShaper}}
end;
handle_call(_Request, State) ->
{ok, ok, State}.
%% @private
handle_event({log, Message},
#state{name=Name, level=L, shaper=Shaper,
formatter=Formatter,formatter_config=FormatConfig} = State) ->
#state{name=Name, level=L, shaper=Shaper, formatter=Formatter,formatter_config=FormatConfig} = State) ->
case lager_util:is_loggable(Message,L,{lager_file_backend, Name}) of
true ->
case lager_util:check_hwm(Shaper) of
{true, Drop, #lager_shaper{hwm=Hwm} = NewShaper} ->
NewState = case Drop > 0 of
true ->
Report = io_lib:format("lager_file_backend dropped ~p messages in the last second that exceeded the limit of ~p messages/sec", [Drop, Hwm]),
ReportMsg = lager_msg:new(Report, warning, [], []),
write(State,
lager_msg:timestamp(ReportMsg),
lager_msg:severity_as_int(ReportMsg),
Formatter:format(ReportMsg, FormatConfig));
false ->
State
end,
{ok,write(NewState#state{shaper=NewShaper},
lager_msg:timestamp(Message),
lager_msg:severity_as_int(Message),
Formatter:format(Message,FormatConfig)) };
{false, _, NewShaper} ->
{ok, State#state{shaper=NewShaper}}
end;
case lager_util:check_hwm(Shaper) of
{true, Drop, #lager_shaper{hwm=Hwm} = NewShaper} ->
NewState = case Drop > 0 of
true ->
Report = io_lib:format(
"lager_file_backend dropped ~p messages in the last second that exceeded the limit of ~p messages/sec",
[Drop, Hwm]),
ReportMsg = lager_msg:new(Report, warning, [], []),
write(State, lager_msg:timestamp(ReportMsg),
lager_msg:severity_as_int(ReportMsg), Formatter:format(ReportMsg, FormatConfig));
false ->
State
end,
{ok,write(NewState#state{shaper=NewShaper},
lager_msg:timestamp(Message), lager_msg:severity_as_int(Message),
Formatter:format(Message,FormatConfig))};
{false, _, NewShaper} ->
{ok, State#state{shaper=NewShaper}}
end;
false ->
{ok, State}
end;

Yükleniyor…
İptal
Kaydet