Browse Source

Add t to string formatting to accept unicode file and dir names

pull/510/head
Luke Bakken 5 years ago
parent
commit
f47a8be9a6
No known key found for this signature in database GPG Key ID: D99DE30E43EAE440
3 changed files with 10 additions and 10 deletions
  1. +1
    -1
      src/lager.erl
  2. +3
    -3
      src/lager_crash_log.erl
  3. +6
    -6
      src/lager_file_backend.erl

+ 1
- 1
src/lager.erl View File

@ -392,7 +392,7 @@ status() ->
Level = get_loglevel(Sink, Handler), Level = get_loglevel(Sink, Handler),
case Handler of case Handler of
{lager_file_backend, File} -> {lager_file_backend, File} ->
io_lib:format("File ~s (~s) at level ~p\n", [File, Sink, Level]);
io_lib:format("File ~ts (~s) at level ~p\n", [File, Sink, Level]);
lager_console_backend -> lager_console_backend ->
io_lib:format("Console (~s) at level ~p\n", [Sink, Level]); io_lib:format("Console (~s) at level ~p\n", [Sink, Level]);
_ -> _ ->

+ 3
- 3
src/lager_crash_log.erl View File

@ -80,7 +80,7 @@ init([RelFilename, MaxBytes, Size, Date, Count, Rotator]) ->
fmtmaxbytes=MaxBytes, size=Size, count=Count, date=Date, fmtmaxbytes=MaxBytes, size=Size, count=Count, date=Date,
rotator=Rotator}}; rotator=Rotator}};
{error, Reason} -> {error, Reason} ->
?INT_LOG(error, "Failed to open crash log file ~s with error: ~s",
?INT_LOG(error, "Failed to open crash log file ~ts with error: ~s",
[Filename, file:format_error(Reason)]), [Filename, file:format_error(Reason)]),
{ok, #state{name=Filename, fmtmaxbytes=MaxBytes, flap=true, {ok, #state{name=Filename, fmtmaxbytes=MaxBytes, flap=true,
size=Size, count=Count, date=Date, rotator=Rotator}} size=Size, count=Count, date=Date, rotator=Rotator}}
@ -216,7 +216,7 @@ do_log({log, Event}, #state{name=Name, fd=FD, inode=Inode, flap=Flap,
Msg = io_lib:format("~s~s~s", [Time, MsgStr, NodeSuffix]), Msg = io_lib:format("~s~s~s", [Time, MsgStr, NodeSuffix]),
case file:write(NewFD, unicode:characters_to_binary(Msg)) of case file:write(NewFD, unicode:characters_to_binary(Msg)) of
{error, Reason} when Flap == false -> {error, Reason} when Flap == false ->
?INT_LOG(error, "Failed to write log message to file ~s: ~s",
?INT_LOG(error, "Failed to write log message to file ~ts: ~s",
[Name, file:format_error(Reason)]), [Name, file:format_error(Reason)]),
{ok, State#state{fd=NewFD, inode=NewInode, flap=true}}; {ok, State#state{fd=NewFD, inode=NewInode, flap=true}};
ok -> ok ->
@ -229,7 +229,7 @@ do_log({log, Event}, #state{name=Name, fd=FD, inode=Inode, flap=Flap,
true -> true ->
{ok, State}; {ok, State};
_ -> _ ->
?INT_LOG(error, "Failed to reopen crash log ~s with error: ~s",
?INT_LOG(error, "Failed to reopen crash log ~ts with error: ~s",
[Name, file:format_error(Reason)]), [Name, file:format_error(Reason)]),
{ok, State#state{flap=true}} {ok, State#state{flap=true}}
end end

+ 6
- 6
src/lager_file_backend.erl View File

@ -126,7 +126,7 @@ init(LogFileConfig) when is_list(LogFileConfig) ->
{ok, {FD, Inode, _}} -> {ok, {FD, Inode, _}} ->
State0#state{fd=FD, inode=Inode}; State0#state{fd=FD, inode=Inode};
{error, Reason} -> {error, Reason} ->
?INT_LOG(error, "Failed to open log file ~s with error ~s", [Name, file:format_error(Reason)]),
?INT_LOG(error, "Failed to open log file ~ts with error ~s", [Name, file:format_error(Reason)]),
State0#state{flap=true} State0#state{flap=true}
end, end,
{ok, State} {ok, State}
@ -149,7 +149,7 @@ handle_call({set_loghwm, Hwm}, #state{shaper=Shaper, name=Name} = State) ->
{ok, {error, bad_log_hwm}, State}; {ok, {error, bad_log_hwm}, State};
_ -> _ ->
NewShaper = Shaper#lager_shaper{hwm=Hwm}, NewShaper = Shaper#lager_shaper{hwm=Hwm},
?INT_LOG(notice, "Changed loghwm of ~s to ~p", [Name, Hwm]),
?INT_LOG(notice, "Changed loghwm of ~ts to ~p", [Name, Hwm]),
{ok, {last_loghwm, Shaper#lager_shaper.hwm}, State#state{shaper=NewShaper}} {ok, {last_loghwm, Shaper#lager_shaper.hwm}, State#state{shaper=NewShaper}}
end; end;
handle_call(rotate, State = #state{name=File}) -> handle_call(rotate, State = #state{name=File}) ->
@ -255,7 +255,7 @@ write(#state{name=Name, fd=FD, inode=Inode, flap=Flap, size=RotSize,
true -> true ->
State; State;
_ -> _ ->
?INT_LOG(error, "Failed to rotate log file ~s with error ~s", [Name, file:format_error(Reason)]),
?INT_LOG(error, "Failed to rotate log file ~ts with error ~s", [Name, file:format_error(Reason)]),
State#state{flap=true} State#state{flap=true}
end end
end; end;
@ -267,7 +267,7 @@ write(#state{name=Name, fd=FD, inode=Inode, flap=Flap, size=RotSize,
true -> true ->
State; State;
_ -> _ ->
?INT_LOG(error, "Failed to reopen log file ~s with error ~s", [Name, file:format_error(Reason)]),
?INT_LOG(error, "Failed to reopen log file ~ts with error ~s", [Name, file:format_error(Reason)]),
State#state{flap=true} State#state{flap=true}
end end
end; end;
@ -284,7 +284,7 @@ do_write(#state{fd=FD, name=Name, flap=Flap} = State, Level, Msg) ->
%% force a sync on any message that matches the 'sync_on' bitmask %% force a sync on any message that matches the 'sync_on' bitmask
Flap2 = case file:datasync(FD) of Flap2 = case file:datasync(FD) of
{error, Reason2} when Flap == false -> {error, Reason2} when Flap == false ->
?INT_LOG(error, "Failed to write log message to file ~s: ~s",
?INT_LOG(error, "Failed to write log message to file ~ts: ~s",
[Name, file:format_error(Reason2)]), [Name, file:format_error(Reason2)]),
true; true;
ok -> ok ->
@ -327,7 +327,7 @@ validate_logfile_proplist(List) ->
end end
catch catch
{bad_config, Msg, Value} -> {bad_config, Msg, Value} ->
?INT_LOG(error, "~s ~p for file ~p",
?INT_LOG(error, "~s ~p for file ~tp",
[Msg, Value, proplists:get_value(file, List)]), [Msg, Value, proplists:get_value(file, List)]),
false false
end. end.

Loading…
Cancel
Save