Rotate as gen_event:call

src/lager.erl

@@ -605,7 +605,7 @@ rotate_file(FileName) ->
             (_) -> false
         end,
         Handlers),
-    lager_file_backend:rotate_handlers(RotateHandlers).
+    rotate_handlers(RotateHandlers).
 
 rotate_sink(Sink) ->
     Handlers = lager_config:global_get(handlers),
@@ -614,7 +614,15 @@ rotate_sink(Sink) ->
            (_) -> false 
         end, 
         Handlers),
-    lager_file_backend:rotate_handlers(RotateHandlers).
+    rotate_handlers(RotateHandlers).
 
 rotate_all() -> 
-    lager_file_backend:rotate_handlers(lager_config:global_get(handlers)).
+    rotate_handlers(lager_config:global_get(handlers)).
+
+
+rotate_handlers(Handlers) ->
+    [ rotate_handler(Handler) || Handler <- Handlers ].
+
+rotate_handler({Backend, Handler, Sink}) ->
+    gen_event:call(Sink, Backend, rotate, infinity).
+

src/lager_file_backend.erl

@@ -42,7 +42,6 @@
 
 -export([init/1, handle_call/2, handle_event/2, handle_info/2, terminate/2,
         code_change/3]).
--export([rotate_handlers/1, rotate_handler/1]).
 
 -export([config_to_id/1]).
 
@@ -143,6 +142,9 @@ handle_call({set_loghwm, Hwm}, #state{shaper=Shaper, name=Name} = State) ->
             ?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(rotate, State = #state{name=File}) ->
+    {ok, NewState} = handle_info({rotate, File}, State),
+    {ok, ok, NewState};
 handle_call(_Request, State) ->
     {ok, ok, State}.
 
@@ -402,13 +404,6 @@ schedule_rotation(Name, Date) ->
     erlang:send_after(lager_util:calculate_next_rotation(Date) * 1000, self(), {rotate, Name}),
     ok.
 
-rotate_handlers(Handlers) ->
-    [ rotate_handler(Handler) || Handler <- Handlers ].
-
-rotate_handler({{lager_file_backend, FileName}, Handler, _Sink}) ->
-    Handler ! {rotate, lager_util:expand_path(FileName)};
-rotate_handler(_) -> ok.
-
 -ifdef(TEST).
 
 get_loglevel_test() ->
@@ -637,6 +632,16 @@ filesystem_test_() ->
                         ?assert(filelib:is_regular("test.log.0"))
                 end
             },
+            {"rotation call should work",
+                fun() ->
+                        gen_event:add_handler(lager_event, {lager_file_backend, "test.log"}, [{file, "test.log"}, {level, info}, {check_interval, 1000}]),
+                        lager:log(error, self(), "Test message1"),
+                        lager:log(error, self(), "Test message1"),
+                        gen_event:call(lager_event, {lager_file_backend, "test.log"}, rotate, infinity),
+                        lager:log(error, self(), "Test message1"),
+                        ?assert(filelib:is_regular("test.log.0")) 
+                end
+            },
             {"sync_on option should work",
                 fun() ->
                         gen_event:add_handler(lager_event, lager_file_backend, [{file, "test.log"}, {level, info}, {sync_on, "=info"}, {check_interval, 5000}, {sync_interval, 5000}]),

test/lager_rotate.erl

@@ -0,0 +1,135 @@
+-module(lager_rotate).
+
+-compile(export_all).
+
+-ifdef(TEST).
+-include_lib("eunit/include/eunit.hrl").
+-endif.
+
+
+rotate_test_() ->
+    {foreach,
+        fun() ->
+                file:write_file("test1.log", ""),
+                file:write_file("test2.log", ""),
+                file:write_file("test3.log", ""),
+                file:delete("test1.log.0"),
+                file:delete("test2.log.0"),
+                file:delete("test3.log.0"),
+                error_logger:tty(false),
+                application:load(lager),
+                application:set_env(lager, handlers, 
+                    [{lager_file_backend, [{file, "test1.log"}, {level, info}]},
+                     {lager_file_backend, [{file, "test2.log"}, {level, info}]}]),
+                application:set_env(lager, extra_sinks,
+                    [{sink_event, 
+                        [{handlers, 
+                            [{lager_file_backend, [{file, "test3.log"}, {level, info}]}]}
+                        ]}]),
+                application:set_env(lager, error_logger_redirect, false),
+                application:set_env(lager, async_threshold, undefined),
+                lager:start()
+        end,
+        fun(_) ->
+                file:delete("test1.log"),
+                file:delete("test2.log"),
+                file:delete("test3.log"),
+                file:delete("test1.log.0"),
+                file:delete("test2.log.0"),
+                file:delete("test3.log.0"),
+                application:stop(lager),
+                application:stop(goldrush),
+                error_logger:tty(true)
+        end,
+        [{"Rotate single file",
+            fun() ->
+                lager:log(error, self(), "Test message 1"),
+                lager:log(sink_event, error, self(), "Sink test message 1", []),
+                lager:rotate_file("test1.log"),
+                timer:sleep(1000),
+                true = filelib:is_regular("test1.log.0"),
+                lager:log(error, self(), "Test message 2"),
+                lager:log(sink_event, error, self(), "Sink test message 2", []),
+                
+                {ok, File1} = file:read_file("test1.log"),
+                {ok, File2} = file:read_file("test2.log"),
+                {ok, SinkFile} = file:read_file("test3.log"),
+                {ok, File1Old} = file:read_file("test1.log.0"),
+
+                have_no_log(File1, <<"Test message 1">>),
+                have_log(File1, <<"Test message 2">>),
+
+                have_log(File2, <<"Test message 1">>),
+                have_log(File2, <<"Test message 2">>),
+
+                have_log(File1Old, <<"Test message 1">>),
+                have_no_log(File1Old, <<"Test message 2">>),
+
+                have_log(SinkFile, <<"Sink test message 1">>),
+                have_log(SinkFile, <<"Sink test message 2">>)
+            end},
+         {"Rotate sink",
+            fun() ->
+                lager:log(error, self(), "Test message 1"),
+                lager:log(sink_event, error, self(), "Sink test message 1", []),
+                lager:rotate_sink(sink_event),
+                timer:sleep(1000),
+                true = filelib:is_regular("test3.log.0"),
+                lager:log(error, self(), "Test message 2"),
+                lager:log(sink_event, error, self(), "Sink test message 2", []),
+                {ok, File1} = file:read_file("test1.log"),
+                {ok, File2} = file:read_file("test2.log"),
+                {ok, SinkFile} = file:read_file("test3.log"),
+                {ok, SinkFileOld} = file:read_file("test3.log.0"),
+
+                have_log(File1, <<"Test message 1">>),
+                have_log(File1, <<"Test message 2">>),
+
+                have_log(File2, <<"Test message 1">>),
+                have_log(File2, <<"Test message 2">>),
+
+                have_log(SinkFileOld, <<"Sink test message 1">>),
+                have_no_log(SinkFileOld, <<"Sink test message 2">>),
+
+                have_no_log(SinkFile, <<"Sink test message 1">>),
+                have_log(SinkFile, <<"Sink test message 2">>)
+            end},
+         {"Rotate all",
+            fun() ->
+                lager:log(error, self(), "Test message 1"),
+                lager:log(sink_event, error, self(), "Sink test message 1", []),
+                lager:rotate_all(),
+                timer:sleep(1000),
+                true = filelib:is_regular("test3.log.0"),
+                lager:log(error, self(), "Test message 2"),
+                lager:log(sink_event, error, self(), "Sink test message 2", []),
+                {ok, File1} = file:read_file("test1.log"),
+                {ok, File2} = file:read_file("test2.log"),
+                {ok, SinkFile} = file:read_file("test3.log"),
+                {ok, File1Old} = file:read_file("test1.log.0"),
+                {ok, File2Old} = file:read_file("test2.log.0"),
+                {ok, SinkFileOld} = file:read_file("test3.log.0"),
+
+                have_no_log(File1, <<"Test message 1">>),
+                have_log(File1, <<"Test message 2">>),
+
+                have_no_log(File2, <<"Test message 1">>),
+                have_log(File2, <<"Test message 2">>),
+
+                have_no_log(SinkFile, <<"Sink test message 1">>),
+                have_log(SinkFile, <<"Sink test message 2">>),
+
+                have_log(File1Old, <<"Test message 1">>),
+                have_no_log(File1Old, <<"Test message 2">>),
+
+                have_log(File2Old, <<"Test message 1">>),
+                have_no_log(File2Old, <<"Test message 2">>)
+
+            end}]}.
+
+have_log(Data, Log) ->
+    {_,_} = binary:match(Data, Log).
+
+have_no_log(Data, Log) ->
+    nomatch = binary:match(Data, Log).
+