rjack-logback 1.0.0.0-java → 1.1.0.0-java

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 1.1.0.0 (2010-12-28)
+* Upgraded to Logback 0.9.27
+* Added previously missing Logback::OFF level (Bill Dueber)
+* Added LevelChangePropagator extension and config_console
+  :propagate_to_jul flag
+
 === 1.0.0.0 (2010-8-31)
 
 The upstream Logback project has introduced several

data/Manifest.txt

@@ -8,6 +8,6 @@ lib/rjack-logback/base.rb
 lib/rjack-logback.rb
 lib/rjack-logback/access.rb
 test/test_logback.rb
-lib/rjack-logback/logback-access-0.9.24.jar
-lib/rjack-logback/logback-classic-0.9.24.jar
-lib/rjack-logback/logback-core-0.9.24.jar
+lib/rjack-logback/logback-access-0.9.27.jar
+lib/rjack-logback/logback-classic-0.9.27.jar
+lib/rjack-logback/logback-core-0.9.27.jar

data/lib/rjack-logback.rb

@@ -104,6 +104,9 @@ module RJack
     # Level::ERROR
     ERROR = Level::ERROR
 
+    # Level::OFF
+    OFF = Level::OFF
+
     DEFAULT_PATTERN = "%date [%thread] %-5level %logger{35} - %msg %ex%n" #:nodoc:
 
     @@context = SLF4J.linked_factory
@@ -243,6 +246,23 @@ module RJack
       end
     end
 
+    JLevelChangePropagator = Java::ch.qos.logback.classic.jul.LevelChangePropagator
+
+    # Extends
+    # ch.qos.logback.classic.jul.LevelChangePropagator[http://logback.qos.ch/apidocs/ch/qos/logback/classic/jul/LevelChangePropagator.html]
+    # with a block initializer.
+    class LevelChangePropagator < JLevelChangePropagator
+
+      def initialize( reset_jul = true )
+        super()
+        self.context = Logback.context
+        self.reset_jul = reset_jul
+        yield( self ) if block_given?
+        Util.start( self )
+      end
+
+    end
+
     # Configure Logback with the specified block. The Logback context is
     # +reset+, yielded to block, and then started after return
     # from the block.
@@ -264,8 +284,15 @@ module RJack
     # :lwidth<~to_s>:: Logger width (default: :full ? 35 : 30)
     # :mdc<String|Array[String]>:: One or more Mapped Diagnostic Context keys
     # :mdc_width<~to_s}:: MDC width (default: unspecified)
+    # :propagate_to_jul:: Propagate level changes to
+    #                     java.util.logging, additionally resetting
+    #                     JUL levels if value is :reset (default: false)
     def self.config_console( options = {} )
-      configure do
+      configure do |ctx|
+        if options[ :propagate_to_jul ]
+          r = ( options[ :propagate_to_jul ] == :reset )
+          ctx.add_listener( LevelChangePropagator.new( r ) )
+        end
         console = Logback::ConsoleAppender.new do |a|
           a.target = "System.err" if options[ :stderr ]
           a.layout = Logback::PatternLayout.new do |layout|
@@ -276,7 +303,7 @@ module RJack
             w = ( options[ :lwidth ] || ( options[ :full ] ? 35 : 30 ) )
             pat << "%logger{#{w}}"
 
-            mdcs = options[ :mdc ].to_a.map { |k| "%X{#{k}}" }
+            mdcs = Array( options[ :mdc ] ).map { |k| "%X{#{k}}" }
             unless mdcs.empty?
               mp = ( '\(' + mdcs.join(',') + '\)' )
               mw = options[ :mdc_width ]

data/lib/rjack-logback/base.rb

@@ -15,10 +15,10 @@
 module RJack
   module Logback
     # Logback java version
-    LOGBACK_VERSION = '0.9.24'
+    LOGBACK_VERSION = '0.9.27'
 
     # Logback gem version
-    VERSION = '1.0.0.0'
+    VERSION = '1.1.0.0'
 
     LOGBACK_DIR = File.dirname(__FILE__) # :nodoc:
   end

data/pom.xml

@@ -12,14 +12,14 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>0.9.24</version>
+      <version>0.9.27</version>
       <scope>runtime</scope>
     </dependency>
 
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-access</artifactId>
-      <version>0.9.24</version>
+      <version>0.9.27</version>
       <scope>runtime</scope>
     </dependency>
 

data/test/test_logback.rb

@@ -16,6 +16,7 @@
 require 'rubygems'
 gem( 'rjack-slf4j', '~> 1.6.0' )
 require 'rjack-slf4j'
+require 'rjack-slf4j/jul-to-slf4j'
 
 $LOAD_PATH.unshift File.join( File.dirname(__FILE__), "..", "lib" )
 require 'rjack-logback'
@@ -77,6 +78,15 @@ class TestLevelSet < Test::Unit::TestCase
     assert_equal( 0, @appender.count )
   end
 
+  def test_off
+    Logback.root.level = Logback::OFF
+    assert( ! @log.debug? )
+    @log.debug( "not logged" )
+    @log.warn { "also not logged" }
+    @log.error { "again; not logged"}
+    assert_equal( 0, @appender.count )
+  end
+
   def test_above_level
     Logback.root.level = Logback::TRACE
     assert( @log.trace? )
@@ -101,6 +111,31 @@ class TestLevelSet < Test::Unit::TestCase
 
 end
 
+class TestJULPropagator < Test::Unit::TestCase
+  include RJack
+
+  def test_jul_propagator
+    SLF4J::JUL.replace_root_handlers
+
+    appender = TestAppender.new
+    Logback.configure do |ctx|
+      ctx.add_listener( Logback::LevelChangePropagator.new )
+      Logback.root.add_appender( appender )
+      Logback.root.level = Logback::WARN
+      Logback[ "alt" ].level = Logback::DEBUG
+    end
+
+    assert( ! SLF4J::JUL[ "other"   ].loggable?( SLF4J::JUL::INFO ) )
+    assert(   SLF4J::JUL[ "alt.sub" ].loggable?( SLF4J::JUL::INFO ) )
+
+    SLF4J::JUL[ "other"   ].info( "shouldn't" )
+    assert_equal( 0, appender.count )
+    SLF4J::JUL[ "alt.sub" ].info( "should" )
+    assert_equal( 1, appender.count )
+  end
+
+end
+
 class TestConfigure < Test::Unit::TestCase
   include RJack
 
@@ -153,7 +188,7 @@ class TestConfigure < Test::Unit::TestCase
     assert_equal( 1, appender.count )
   end
 
-  def test_config_console
+  def test_config_console_mdc
     Logback.config_console( :mdc => [ :key1, :key2 ], :mdc_width => 11 )
     log = SLF4J[ self.class ]
     log.info "without"

metadata

@@ -3,11 +3,11 @@ name: rjack-logback
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
+    - 1
     - 1
     - 0
     - 0
-    - 0
-  version: 1.0.0.0
+  version: 1.1.0.0
 platform: java
 authors: 
   - David Kellum
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 -07:00
+date: 2010-12-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -42,8 +42,8 @@ dependencies:
             segments: 
               - 1
               - 2
-              - 2
-            version: 1.2.2
+              - 3
+            version: 1.2.3
     type: :development
     version_requirements: *id002
 description: |-
@@ -72,9 +72,9 @@ files:
   - lib/rjack-logback.rb
   - lib/rjack-logback/access.rb
   - test/test_logback.rb
-  - lib/rjack-logback/logback-access-0.9.24.jar
-  - lib/rjack-logback/logback-classic-0.9.24.jar
-  - lib/rjack-logback/logback-core-0.9.24.jar
+  - lib/rjack-logback/logback-access-0.9.27.jar
+  - lib/rjack-logback/logback-classic-0.9.27.jar
+  - lib/rjack-logback/logback-core-0.9.27.jar
 has_rdoc: true
 homepage: http://rjack.rubyforge.org
 licenses: []