logging 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ec479cf977c621a6b42426cfe7c478a97e106c23762f3608ee67fcbaa49b324
-  data.tar.gz: 6a0c0107cf3c1a1f7504e19e85a9505ad94c4a84991d01eb6c65191257a01163
+  metadata.gz: f7bb89dcc5956ebabbf591d8f8d348e0e3cfdc7cb5fa356e9995168278b45a95
+  data.tar.gz: be4ad44cf88417be5abe80fbaf0b1d28a2f4899df2c00d1d4818af78cc440443
 SHA512:
-  metadata.gz: 2cd72dabcd8b878b73f69ec8a445678b14635ca1c115576ef148a7160673f83939d7706e5d673c32ed11ef2c48046cc7a50bd2c2c0795b2fa79c35e9d4bccf87
-  data.tar.gz: 23422872b58d1bd0e0a146f64e4bb792ef5208da309b16e7650d5c74ca9969b12e6e65dd5ef79a90ce39e0d6c51dbc7514f7a2e913ec74b2e8404a06aefa8975
+  metadata.gz: b61a6a3bcda67484ec4334a89adfd6149d2aa91be51ba0ca476514c7c4532d0b4040cc202ce58d30e9d93ba5821e6eedbde77d8bdeaac7a82224731796d79eda
+  data.tar.gz: 55c888af479f8c01eb89f96eda24b2cc9cd92f52cc0b1f21d5fde7fcb7e91e573b6007998c67b00781cf8c5ea3eadcb9462b9df2da26dbcfe0464deb13340d18

data/History.txt

@@ -1,3 +1,9 @@
+== 2.3.1 / 2022-05-24
+
+Bug Fixes
+- logging hangs on JRuby when the stdout appender is closed [PR #237]
+- initialize the Logging framework when a Filter is created [PR #238]
+
 == 2.3.0 / 2020-07-04
 
 Enhancements

data/lib/logging/appenders/console.rb

@@ -37,10 +37,7 @@ module Logging::Appenders
     # is currently open then it will be closed and immediately reopened.
     def reopen
       @mutex.synchronize {
-        if defined? @io && @io
-          flush
-          @io.close rescue nil
-        end
+        flush if defined? @io && @io
         @io = open_fd
       }
       super
@@ -51,20 +48,13 @@ module Logging::Appenders
 
     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
 

data/lib/logging/appenders/io.rb

@@ -48,7 +48,7 @@ module Logging::Appenders
       super
 
       io, @io = @io, nil
-      unless [STDIN, STDERR, STDOUT].include?(io)
+      if ![STDIN, STDERR, STDOUT].include?(io)
         io.send(@close_method) if @close_method && io.respond_to?(@close_method)
       end
     rescue IOError

data/lib/logging/filter.rb

@@ -8,10 +8,17 @@ module Logging
   # Otherwise the `allow` method should return `nil`.
   class Filter
 
-    # Returns the event if it should be allowed into the log. Returns `nil` if
-    # the event should _not_ be allowed into the log. Subclasses should override
-    # this method and provide their own filtering semantics.
-    def allow( event )
+    # Creates a new level filter that will pass all log events. Create a
+    # subclass and override the `allow` method to filter log events.
+    def initialize
+      ::Logging.init unless ::Logging.initialized?
+    end
+
+    # Returns the event if it should be forwarded to the logging appender.
+    # Returns `nil` if the event should _not_ be forwarded to the logging
+    # appender. Subclasses should override this method and provide their own
+    # filtering semantics.
+    def allow(event)
       event
     end
   end

data/lib/logging/filters/level.rb

@@ -4,8 +4,7 @@ module Logging
   module Filters
 
     # The `Level` filter class provides a simple level-based filtering mechanism
-    # that filters messages to only include those from an enumerated list of
-    # levels to log.
+    # that allows events whose log level matches a preconfigured list of values.
     class Level < ::Logging::Filter
 
       # Creates a new level filter that will only allow the given _levels_ to
@@ -15,15 +14,19 @@ module Logging
       # Examples
       #     Logging::Filters::Level.new(:debug, :info)
       #
-      def initialize( *levels )
-        levels  = levels.map { |level| ::Logging::level_num(level) }
-        @levels = Set.new levels
+      def initialize(*levels)
+        super()
+        levels  = levels.flatten.map {|level| ::Logging::level_num(level)}
+        @levels = Set.new(levels)
       end
 
-      def allow( event )
+      # Returns the event if it should be forwarded to the logging appender.
+      # Otherwise, `nil` is returned. The log event is allowed if the
+      # `event.level` matches one of the levels provided to the filter when it
+      # was constructred.
+      def allow(event)
         @levels.include?(event.level) ? event : nil
       end
-
     end
   end
 end

data/lib/logging/filters.rb

@@ -1,4 +1,4 @@
 module Logging
   module Filters ; end
   require libpath('logging/filters/level')
-end
+end

data/lib/logging/log_event.rb

@@ -12,7 +12,8 @@ module Logging
     # * $3 == method name (might be nil)
     CALLER_RGXP = %r/([-\.\/\(\)\w]+):(\d+)(?::in `([^']+)')?/o
     #CALLER_INDEX = 2
-    CALLER_INDEX = ((defined? JRUBY_VERSION and JRUBY_VERSION > '1.6') or (defined? RUBY_ENGINE and RUBY_ENGINE[%r/^rbx/i])) ? 1 : 2
+    CALLER_INDEX = ((defined?(JRUBY_VERSION) && JRUBY_VERSION > '1.6' && JRUBY_VERSION < '9.0') ||
+                    (defined?(RUBY_ENGINE) && RUBY_ENGINE[%r/^rbx/i])) ? 1 : 2
     # :startdoc:
 
     attr_accessor :logger, :level, :data, :time, :file, :line, :method_name

data/lib/logging/version.rb

@@ -1,5 +1,5 @@
 module Logging
-  VERSION = "2.3.0".freeze
+  VERSION = "2.3.1".freeze
 
   # Returns the version string for the library.
   def self.version

data/test/appenders/test_console.rb

@@ -22,7 +22,7 @@ module TestAppenders
       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,16 +45,16 @@ module TestAppenders
 
       appender.close
       assert appender.closed?
-      assert io.closed?
+      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?
-      assert io.closed?
+      refute io.closed?
     end
   end
 
@@ -68,8 +68,8 @@ module TestAppenders
       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
@@ -91,16 +91,16 @@ module TestAppenders
 
       appender.close
       assert appender.closed?
-      assert io.closed?
+      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?
-      assert io.closed?
+      refute io.closed?
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logging
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Tim Pease
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-04 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: little-plugger
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.4
+        version: 3.8.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.4
+        version: 3.8.5
 description: |-
   **Logging** is a flexible logging library for use in Ruby programs based on the
   design of Java's log4j library. It features a hierarchical logging system,
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A flexible and extendable logging library for Ruby