Skip to content

Commit

Permalink
Make tests less dependant on timer:sleeps to function correctly
Browse files Browse the repository at this point in the history
  • Loading branch information
@Vagabond
Vagabond committed Sep 7, 2011
1 parent 80f5ffb commit 4dfee06
Show file tree
Hide file tree
Showing 5 changed files with 180 additions and 96 deletions.
2 changes: 1 addition & 1 deletion src/error_logger_lager_h.erl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
end).

-define(CRASH_LOG(Event),
gen_server:cast(lager_crash_log, {log, Event})).
catch(gen_server:call(lager_crash_log, {log, Event}))).

-spec init(any()) -> {ok, {}}.
init(_) ->
Expand Down
51 changes: 25 additions & 26 deletions src/lager_crash_log.erl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,7 @@ init([Filename, MaxBytes, Size, Date, Count]) ->
end.

%% @private
handle_call(_Call, _From, State) ->
{reply, ok, State}.

%% @private
handle_cast({log, Event}, #state{name=Name, fd=FD, inode=Inode, flap=Flap,
handle_call({log, Event}, _From, #state{name=Name, fd=FD, inode=Inode, flap=Flap,
fmtmaxbytes=FmtMaxBytes, size=RotSize, count=Count} = State) ->
%% borrowed from riak_err
{ReportStr, Pid, MsgStr, _ErrorP} = case Event of
Expand All @@ -98,7 +94,7 @@ handle_cast({log, Event}, #state{name=Name, fd=FD, inode=Inode, flap=Flap,
{ignore, ignore, ignore, false}
end,
if ReportStr == ignore ->
{noreply, State};
{reply, ok, State};
true ->
case lager_util:ensure_logfile(Name, FD, Inode, false) of
{ok, {_, _, Size}} when RotSize /= 0, Size > RotSize ->
Expand All @@ -114,23 +110,27 @@ handle_cast({log, Event}, #state{name=Name, fd=FD, inode=Inode, flap=Flap,
{error, Reason} when Flap == false ->
?INT_LOG(error, "Failed to write log message to file ~s: ~s",
[Name, file:format_error(Reason)]),
{noreply, State#state{fd=NewFD, inode=NewInode, flap=true}};
{reply, ok, State#state{fd=NewFD, inode=NewInode, flap=true}};
ok ->
{noreply, State#state{fd=NewFD, inode=NewInode, flap=false}};
{reply, ok, State#state{fd=NewFD, inode=NewInode, flap=false}};
_ ->
{noreply, State#state{fd=NewFD, inode=NewInode}}
{reply, ok, State#state{fd=NewFD, inode=NewInode}}
end;
{error, Reason} ->
case Flap of
true ->
{noreply, State};
{reply, ok, State};
_ ->
?INT_LOG(error, "Failed to reopen crash log ~s with error: ~s",
[Name, file:format_error(Reason)]),
{noreply, State#state{flap=true}}
{reply, ok, State#state{flap=true}}
end
end
end;
handle_call(_Call, _From, State) ->
{reply, ok, State}.

%% @private
handle_cast(_Request, State) ->
{noreply, State}.

Expand Down Expand Up @@ -250,8 +250,8 @@ filesystem_test_() ->
{"under normal circumstances, file should be opened",
fun() ->
{ok, _} = ?MODULE:start_link("crash_test.log", 65535, 0, undefined, 0),
error_logger:error_msg("Test message\n"),
timer:sleep(100),
_ = gen_event:which_handlers(error_logger),
sync_error_logger:error_msg("Test message\n"),
{ok, Bin} = file:read_file("crash_test.log"),
?assertMatch([_, "Test message\n"], re:split(Bin, "\n", [{return, list}, {parts, 2}]))
end
Expand All @@ -270,18 +270,17 @@ filesystem_test_() ->
fun() ->
{ok, _} = ?MODULE:start_link("crash_test.log", 65535, 0, undefined, 0),
?assertEqual(0, lager_test_backend:count()),
error_logger:error_msg("Test message\n"),
timer:sleep(100),
sync_error_logger:error_msg("Test message\n"),
_ = gen_event:which_handlers(error_logger),
?assertEqual(1, lager_test_backend:count()),
file:delete("crash_test.log"),
file:write_file("crash_test.log", ""),
{ok, FInfo} = file:read_file_info("crash_test.log"),
file:write_file_info("crash_test.log", FInfo#file_info{mode = 0}),
error_logger:error_msg("Test message\n"),
timer:sleep(100),
sync_error_logger:error_msg("Test message\n"),
_ = gen_event:which_handlers(error_logger),
?assertEqual(3, lager_test_backend:count()),
lager_test_backend:pop(),
lager_test_backend:pop(),
{_Level, _Time, [_, _, Message]} = lager_test_backend:pop(),
?assertEqual("Failed to reopen crash log crash_test.log with error: permission denied", lists:flatten(Message))
end
Expand All @@ -296,8 +295,8 @@ filesystem_test_() ->
{_Level, _Time, [_, _, Message]} = lager_test_backend:pop(),
?assertEqual("Failed to open crash log file crash_test.log with error: permission denied", lists:flatten(Message)),
file:write_file_info("crash_test.log", FInfo#file_info{mode = OldPerms}),
error_logger:error_msg("Test message~n"),
timer:sleep(100),
sync_error_logger:error_msg("Test message~n"),
_ = gen_event:which_handlers(error_logger),
{ok, Bin} = file:read_file("crash_test.log"),
?assertMatch([_, "Test message\n"], re:split(Bin, "\n", [{return, list}, {parts, 2}]))
end
Expand All @@ -306,19 +305,19 @@ filesystem_test_() ->
fun() ->
{ok, _} = ?MODULE:start_link("crash_test.log", 65535, 0, undefined, 0),
?assertEqual(0, lager_test_backend:count()),
error_logger:error_msg("Test message~n"),
timer:sleep(100),
sync_error_logger:error_msg("Test message~n"),
_ = gen_event:which_handlers(error_logger),
{ok, Bin} = file:read_file("crash_test.log"),
?assertMatch([_, "Test message\n"], re:split(Bin, "\n", [{return, list}, {parts, 2}])),
file:delete("crash_test.log"),
file:write_file("crash_test.log", ""),
error_logger:error_msg("Test message1~n"),
timer:sleep(100),
sync_error_logger:error_msg("Test message1~n"),
_ = gen_event:which_handlers(error_logger),
{ok, Bin1} = file:read_file("crash_test.log"),
?assertMatch([_, "Test message1\n"], re:split(Bin1, "\n", [{return, list}, {parts, 2}])),
file:rename("crash_test.log", "crash_test.log.0"),
error_logger:error_msg("Test message2~n"),
timer:sleep(100),
sync_error_logger:error_msg("Test message2~n"),
_ = gen_event:which_handlers(error_logger),
{ok, Bin2} = file:read_file("crash_test.log"),
?assertMatch([_, "Test message2\n"], re:split(Bin2, "\n", [{return, list}, {parts, 2}]))
end
Expand Down
1 change: 0 additions & 1 deletion src/lager_file_backend.erl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,6 @@ filesystem_test_() ->
{ok, FInfo} = file:read_file_info("test.log"),
file:write_file_info("test.log", FInfo#file_info{mode = 0}),
lager:log(error, self(), "Test message"),
timer:sleep(100),
?assertEqual(3, lager_test_backend:count()),
lager_test_backend:pop(),
lager_test_backend:pop(),
Expand Down
Loading

0 comments on commit 4dfee06

Please sign in to comment.