From c698180e68a0f417415cd087efc303931af3bb3e Mon Sep 17 00:00:00 2001
From: Jeremy Evans <code@jeremyevans.net>
Date: Fri, 16 Aug 2019 09:12:06 -0700
Subject: [PATCH] [ruby/logger] Add reraise_write_errors keyword argument to
 Logger and LogDevice

This allows the user to specify exception classes to treat as regular
exceptions instead of being swallowed.  Among other things, it is
useful for having Logger work with Timeout.

Fixes Ruby Bug 9115.

https://github.com/ruby/logger/commit/436a7d680f
---
 lib/logger.rb              | 9 +++++++--
 lib/logger/log_device.rb   | 9 ++++++++-
 test/logger/test_logger.rb | 9 +++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/lib/logger.rb b/lib/logger.rb
index 4099955ef2..4a9c81b72b 100644
--- a/lib/logger.rb
+++ b/lib/logger.rb
@@ -574,10 +574,14 @@ class Logger
   # - +shift_period_suffix+: sets the format for the filename suffix
   #   for periodic log file rotation; default is <tt>'%Y%m%d'</tt>.
   #   See {Periodic Rotation}[rdoc-ref:Logger@Periodic+Rotation].
+  # - +reraise_write_errors+: An array of exception classes, which will
+  #   be reraised if there is an error when writing to the log device.
+  #   The default is to swallow all exceptions raised.
   #
   def initialize(logdev, shift_age = 0, shift_size = 1048576, level: DEBUG,
                  progname: nil, formatter: nil, datetime_format: nil,
-                 binmode: false, shift_period_suffix: '%Y%m%d')
+                 binmode: false, shift_period_suffix: '%Y%m%d',
+                 reraise_write_errors: [])
     self.level = level
     self.progname = progname
     @default_formatter = Formatter.new
@@ -589,7 +593,8 @@ class Logger
       @logdev = LogDevice.new(logdev, shift_age: shift_age,
         shift_size: shift_size,
         shift_period_suffix: shift_period_suffix,
-        binmode: binmode)
+        binmode: binmode,
+        reraise_write_errors: reraise_write_errors)
     end
   end
 
diff --git a/lib/logger/log_device.rb b/lib/logger/log_device.rb
index 84277a2656..4876adf0b7 100644
--- a/lib/logger/log_device.rb
+++ b/lib/logger/log_device.rb
@@ -11,9 +11,10 @@ class Logger
     attr_reader :filename
     include MonitorMixin
 
-    def initialize(log = nil, shift_age: nil, shift_size: nil, shift_period_suffix: nil, binmode: false)
+    def initialize(log = nil, shift_age: nil, shift_size: nil, shift_period_suffix: nil, binmode: false, reraise_write_errors: [])
       @dev = @filename = @shift_age = @shift_size = @shift_period_suffix = nil
       @binmode = binmode
+      @reraise_write_errors = reraise_write_errors
       mon_initialize
       set_dev(log)
       if @filename
@@ -34,16 +35,22 @@ class Logger
           if @shift_age and @dev.respond_to?(:stat)
             begin
               check_shift_log
+            rescue *@reraise_write_errors
+              raise
             rescue
               warn("log shifting failed. #{$!}")
             end
           end
           begin
             @dev.write(message)
+          rescue *@reraise_write_errors
+            raise
           rescue
             warn("log writing failed. #{$!}")
           end
         end
+      rescue *@reraise_write_errors
+        raise
       rescue Exception => ignored
         warn("log writing failed. #{ignored}")
       end
diff --git a/test/logger/test_logger.rb b/test/logger/test_logger.rb
index 37d0f5862a..2023553a6c 100644
--- a/test/logger/test_logger.rb
+++ b/test/logger/test_logger.rb
@@ -113,6 +113,15 @@ class TestLogger < Test::Unit::TestCase
     assert_raise(ArgumentError) { @logger.level = 'something_wrong' }
   end
 
+  def test_reraise_write_errors
+    c = Object.new
+    e = Class.new(StandardError)
+    c.define_singleton_method(:write){|*| raise e}
+    c.define_singleton_method(:close){}
+    logger = Logger.new(c, :reraise_write_errors=>[e])
+    assert_raise(e) { logger.warn('foo') }
+  end
+
   def test_progname
     assert_nil(@logger.progname)
     @logger.progname = "name"