don't create copies of STDOUT/STDERR

TwP · TwP · commit 5f00514b08ec · 2022-05-20T13:27:47.000-06:00
diff --git a/lib/logging/appenders/console.rb b/lib/logging/appenders/console.rb
@@ -37,14 +37,7 @@ def initialize( *args )
     # is currently open then it will be closed and immediately reopened.
     def reopen
       @mutex.synchronize {
-        if defined? @io && @io
-          flush
-          # JRuby will close the underlying file descriptor, so we don't want to
-          # do that even though this is a copy of STDOUT / STDERR
-          if !defined?(JRUBY_VERSION)
-            @io.close rescue nil
-          end
-        end
+        flush if defined? @io && @io
         @io = open_fd
       }
       super
@@ -55,20 +48,13 @@ def reopen
 
     def open_fd
       case self.class.name
-      when "Logging::Appenders::Stdout"
-        fd = STDOUT.fileno
-        encoding = STDOUT.external_encoding
-      when "Logging::Appenders::Stderr"
-        fd = STDERR.fileno
-        encoding = STDERR.external_encoding
+      when "Logging::Appenders::Stdout"; STDOUT
+      when "Logging::Appenders::Stderr"; STDERR
       else
         raise RuntimeError, "Please do not use the `Logging::Appenders::Console` class directly - " +
                             "use `Logging::Appenders::Stdout` and `Logging::Appenders::Stderr` instead" +
                             " [class #{self.class.name}]"
       end
-
-      mode = ::File::WRONLY | ::File::APPEND
-      ::IO.for_fd(fd, mode: mode, encoding: encoding)
     end
   end
 
diff --git a/lib/logging/appenders/io.rb b/lib/logging/appenders/io.rb
@@ -48,16 +48,9 @@ def close( *args )
       super
 
       io, @io = @io, nil
-
-      # JRuby will always close the underlying file descriptor, so we need to
-      # check the FD number and not just the Ruby object ID
-      close_io = if defined?(JRUBY_VERSION)
-        ![STDIN.fileno, STDERR.fileno, STDOUT.fileno].include?(io.fileno)
-      else
-        ![STDIN, STDERR, STDOUT].include?(io)
+      if ![STDIN, STDERR, STDOUT].include?(io)
+        io.send(@close_method) if @close_method && io.respond_to?(@close_method)
       end
-
-      io.send(@close_method) if close_io && @close_method && io.respond_to?(@close_method)
     rescue IOError
     ensure
       return self
diff --git a/test/appenders/test_console.rb b/test/appenders/test_console.rb
@@ -22,7 +22,7 @@ def test_initialize
       assert_equal 'stdout', appender.name
 
       io = appender.instance_variable_get(:@io)
-      refute_same STDOUT, io
+      assert_same STDOUT, io
       assert_equal STDOUT.fileno, io.fileno
 
       appender = Logging.appenders.stdout('foo')
@@ -45,25 +45,16 @@ def test_reopen
 
       appender.close
       assert appender.closed?
-      # We will not close the IO stream in JRuby
-      if defined?(JRUBY_VERSION)
-        refute io.closed?
-      else
-        assert io.closed?
-      end
+      refute io.closed?
       refute STDOUT.closed?
 
       appender.reopen
       refute appender.closed?
 
       new_io = appender.instance_variable_get(:@io)
-      refute_same io, new_io
+      assert_same io, new_io
       refute new_io.closed?
-      if defined?(JRUBY_VERSION)
-        refute io.closed?
-      else
-        assert io.closed?
-      end
+      refute io.closed?
     end
   end
 
@@ -77,8 +68,8 @@ def test_initialize
       assert_equal 'stderr', appender.name
 
       io = appender.instance_variable_get(:@io)
-      refute_same STDERR, io
-      assert_same STDERR.fileno, io.fileno
+      assert_same STDERR, io
+      assert_equal STDERR.fileno, io.fileno
 
       appender = Logging.appenders.stderr('foo')
       assert_equal 'foo', appender.name
@@ -100,25 +91,16 @@ def test_reopen
 
       appender.close
       assert appender.closed?
-      # We will not close the IO stream in JRuby
-      if defined?(JRUBY_VERSION)
-        refute io.closed?
-      else
-        assert io.closed?
-      end
+      refute io.closed?
       refute STDERR.closed?
 
       appender.reopen
       refute appender.closed?
 
       new_io = appender.instance_variable_get(:@io)
-      refute_same io, new_io
+      assert_same io, new_io
       refute new_io.closed?
-      if defined?(JRUBY_VERSION)
-        refute io.closed?
-      else
-        assert io.closed?
-      end
+      refute io.closed?
     end
   end
 end
