Merge pull request #47 from methodmissing/file-null-log-device

Let File::NULL ("/dev/null", "NUL" etc.) be considered a nil log device
ruby · Mar 29, 2020 · 110d9d1 · 110d9d1
2 parents fb3eff1 + da7bf84
commit 110d9d1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/logger.rb b/lib/logger.rb
@@ -385,7 +385,7 @@ def initialize(logdev, shift_age = 0, shift_size = 1048576, level: DEBUG,
     self.datetime_format = datetime_format
     self.formatter = formatter
     @logdev = nil
-    if logdev
+    if logdev && logdev != File::NULL
       @logdev = LogDevice.new(logdev, shift_age: shift_age,
         shift_size: shift_size,
         shift_period_suffix: shift_period_suffix,
@@ -410,7 +410,7 @@ def initialize(logdev, shift_age = 0, shift_size = 1048576, level: DEBUG,
   # Reopen a log device.
   #
   def reopen(logdev = nil)
-    @logdev.reopen(logdev)
+    @logdev&.reopen(logdev)
     self
   end
 

diff --git a/test/logger/test_logger.rb b/test/logger/test_logger.rb
@@ -216,6 +216,13 @@ def test_reopen
     assert_equal(STDOUT, logger.instance_variable_get(:@logdev).dev)
   end
 
+  def test_reopen_nil_logdevice
+    logger = Logger.new(File::NULL)
+    assert_nothing_raised do
+      logger.reopen(STDOUT)
+    end
+  end
+
   def test_add
     logger = Logger.new(nil)
     logger.progname = "my_progname"
@@ -378,4 +385,9 @@ def test_overriding_level
     log = log(logger, :debug) { "msg" }
     assert_nil log.msg
   end
+
+  def test_does_not_instantiate_log_device_for_File_NULL
+    l = Logger.new(File::NULL)
+    assert_nil(l.instance_variable_get(:@logdev))
+  end
 end