allow setting shift variables in LogDevice when using reopen

Author: titusfortner

lib/logger.rb

@@ -410,8 +410,9 @@ def initialize(logdev, shift_age = 0, shift_size = 1048576, level: DEBUG,
   #
   # Reopen a log device.
   #
-  def reopen(logdev = nil)
-    @logdev&.reopen(logdev)
+  def reopen(logdev = nil, shift_age = nil, shift_size = nil, shift_period_suffix: nil, binmode: nil)
+    @logdev&.reopen(logdev, shift_age: shift_age, shift_size: shift_size,
+                    shift_period_suffix: shift_period_suffix, binmode: binmode)
     self
   end
 

lib/logger/log_device.rb

@@ -16,16 +16,7 @@ def initialize(log = nil, shift_age: nil, shift_size: nil, shift_period_suffix:
       @binmode = binmode
       mon_initialize
       set_dev(log)
-      if @filename
-        @shift_age = shift_age || 7
-        @shift_size = shift_size || 1048576
-        @shift_period_suffix = shift_period_suffix || '%Y%m%d'
-
-        unless @shift_age.is_a?(Integer)
-          base_time = @dev.respond_to?(:stat) ? @dev.stat.mtime : Time.now
-          @next_rotate_time = next_rotate_time(base_time, @shift_age)
-        end
-      end
+      set_file(shift_age, shift_size, shift_period_suffix) if @filename
     end
 
     def write(message)
@@ -59,16 +50,18 @@ def close
       end
     end
 
-    def reopen(log = nil)
+    def reopen(log = nil, shift_age: nil, shift_size: nil, shift_period_suffix: nil, binmode: nil)
       # reopen the same filename if no argument, do nothing for IO
       log ||= @filename if @filename
+      @binmode = binmode unless binmode.nil?
       if log
         synchronize do
           if @filename and @dev
             @dev.close rescue nil # close only file opened by Logger
             @filename = nil
           end
           set_dev(log)
+          set_file(shift_age, shift_size, shift_period_suffix) if @filename
         end
       end
       self
@@ -90,6 +83,17 @@ def set_dev(log)
       end
     end
 
+    def set_file(shift_age, shift_size, shift_period_suffix)
+      @shift_age = shift_age.nil? ? @shift_age || 7 : shift_age
+      @shift_size = shift_size.nil? ? @shift_size || 1048576 : shift_size
+      @shift_period_suffix = shift_period_suffix.nil? ? @shift_period_suffix || '%Y%m%d' : shift_period_suffix
+
+      unless @shift_age.is_a?(Integer)
+        base_time = @dev.respond_to?(:stat) ? @dev.stat.mtime : Time.now
+        @next_rotate_time = next_rotate_time(base_time, @shift_age)
+      end
+    end
+
     def open_logfile(filename)
       begin
         File.open(filename, (File::WRONLY | File::APPEND))

test/logger/test_logdevice.rb

@@ -189,6 +189,83 @@ def test_reopen_file_by_file
     end
   end
 
+  def test_shifting_size_with_reopen
+    tmpfile = Tempfile.new([File.basename(__FILE__, '.*'), '_1.log'])
+    logfile = tmpfile.path
+    logfile0 = logfile + '.0'
+    logfile1 = logfile + '.1'
+    logfile2 = logfile + '.2'
+    logfile3 = logfile + '.3'
+    tmpfile.close(true)
+    File.unlink(logfile) if File.exist?(logfile)
+    File.unlink(logfile0) if File.exist?(logfile0)
+    File.unlink(logfile1) if File.exist?(logfile1)
+    File.unlink(logfile2) if File.exist?(logfile2)
+
+    logger = Logger.new(STDERR)
+    logger.reopen(logfile, 4, 100)
+
+    logger.error("0" * 15)
+    assert_file.exist?(logfile)
+    assert_file.not_exist?(logfile0)
+    logger.error("0" * 15)
+    assert_file.exist?(logfile0)
+    assert_file.not_exist?(logfile1)
+    logger.error("0" * 15)
+    assert_file.exist?(logfile1)
+    assert_file.not_exist?(logfile2)
+    logger.error("0" * 15)
+    assert_file.exist?(logfile2)
+    assert_file.not_exist?(logfile3)
+    logger.error("0" * 15)
+    assert_file.not_exist?(logfile3)
+    logger.error("0" * 15)
+    assert_file.not_exist?(logfile3)
+    logger.close
+    File.unlink(logfile)
+    File.unlink(logfile0)
+    File.unlink(logfile1)
+    File.unlink(logfile2)
+
+    tmpfile = Tempfile.new([File.basename(__FILE__, '.*'), '_2.log'])
+    logfile = tmpfile.path
+    logfile0 = logfile + '.0'
+    logfile1 = logfile + '.1'
+    logfile2 = logfile + '.2'
+    logfile3 = logfile + '.3'
+    tmpfile.close(true)
+    logger = Logger.new(logfile, 4, 150)
+    logger.error("0" * 15)
+    assert_file.exist?(logfile)
+    assert_file.not_exist?(logfile0)
+    logger.error("0" * 15)
+    assert_file.not_exist?(logfile0)
+    logger.error("0" * 15)
+    assert_file.exist?(logfile0)
+    assert_file.not_exist?(logfile1)
+    logger.error("0" * 15)
+    assert_file.not_exist?(logfile1)
+    logger.error("0" * 15)
+    assert_file.exist?(logfile1)
+    assert_file.not_exist?(logfile2)
+    logger.error("0" * 15)
+    assert_file.not_exist?(logfile2)
+    logger.error("0" * 15)
+    assert_file.exist?(logfile2)
+    assert_file.not_exist?(logfile3)
+    logger.error("0" * 15)
+    assert_file.not_exist?(logfile3)
+    logger.error("0" * 15)
+    assert_file.not_exist?(logfile3)
+    logger.error("0" * 15)
+    assert_file.not_exist?(logfile3)
+    logger.close
+    File.unlink(logfile)
+    File.unlink(logfile0)
+    File.unlink(logfile1)
+    File.unlink(logfile2)
+  end
+
   def test_shifting_size
     tmpfile = Tempfile.new([File.basename(__FILE__, '.*'), '_1.log'])
     logfile = tmpfile.path