rjack-slf4j 1.7.7.1-java → 1.7.10.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68f4351d7a6899687bf4cb9746af07fec689d010
-  data.tar.gz: d2b5062651eaa446805266493b366f23d605f212
+  metadata.gz: ff7fa05b1380b3ae2e24344427faf5563466f717
+  data.tar.gz: 81730d6ecda80edaad7b4770a5dbfe3b40792733
 SHA512:
-  metadata.gz: a642c3d0960d9537c970e7f995c4bbc5479cd6afa31b249ac4f0d47fcbe6006960e7919663397c6f8c4ed481093d8110e3b8c373132b861f55183cacc664486d
-  data.tar.gz: 07f5da008f606f5df3f185edfa9b9f4ea788cd75f704e12123942752d8186a0cf1145c1f26a83892a963d9e4109c58fdb5e04669d06b0e817bfd5337d19dd74d
+  metadata.gz: 1d5f833465c30b0d82e5e01e89d06a1964e75519981e15c7831f7b82b702452f004c1a3fcc48de6752abb81ba7352d237626faa599c06b69376498f1db4ad455
+  data.tar.gz: ceb76428852fbf8e6c103bfbf5ecd3d3813629e1ef75d498d5b59cf8e4acf1e1d9e90ad0a02ce4fef542e5f08a8c792273212179993752653a4e6897336565c3

data/History.rdoc

@@ -1,3 +1,19 @@
+=== 1.7.10.0 (2015-1-30)
+* Upgraded to SLF4J 1.7.10
+* Somewhere in the JRuby 1.7.x series, exceptions from java that are
+  rescued in ruby are no longer being wrapped in the NativeException
+  ruby class. Update the Logger to also send exceptions of type
+  java.lang.Throwable directly though the SLF4J API. Previous to this
+  fix, java exceptions were being logged like ruby exceptions.
+* Add RJack::SLF4J.ruby_ex_format for globally configurable formatting
+  of ruby exceptions as log messages. Ruby exceptions aren't java
+  Throwable so they won't be formatted by the SLF4J java
+  API. Compatibility with java exception formatting is dependent on
+  the output adapter and its configuration, so this can be set in the
+  same place. Also changed the default format separator between the
+  (prefix) message and exception class name from NEWLINE to SPACE,
+  given at least one raised issue (#7) of incompatibly.
+
 === 1.7.7.1 (2014-8-20)
 * Add one remaining ::Logger compat alias RJack::SLF4J::Logger#unknown
 

data/Manifest.txt

@@ -18,12 +18,12 @@ lib/rjack-slf4j/log4j-over-slf4j.rb
 lib/rjack-slf4j/log4j12.rb
 lib/rjack-slf4j/nop.rb
 lib/rjack-slf4j/simple.rb
-lib/rjack-slf4j/jcl-over-slf4j-1.7.7.jar
-lib/rjack-slf4j/jul-to-slf4j-1.7.7.jar
-lib/rjack-slf4j/log4j-over-slf4j-1.7.7.jar
-lib/rjack-slf4j/slf4j-api-1.7.7.jar
-lib/rjack-slf4j/slf4j-jcl-1.7.7.jar
-lib/rjack-slf4j/slf4j-jdk14-1.7.7.jar
-lib/rjack-slf4j/slf4j-log4j12-1.7.7.jar
-lib/rjack-slf4j/slf4j-nop-1.7.7.jar
-lib/rjack-slf4j/slf4j-simple-1.7.7.jar
+lib/rjack-slf4j/jcl-over-slf4j-1.7.10.jar
+lib/rjack-slf4j/jul-to-slf4j-1.7.10.jar
+lib/rjack-slf4j/log4j-over-slf4j-1.7.10.jar
+lib/rjack-slf4j/slf4j-api-1.7.10.jar
+lib/rjack-slf4j/slf4j-jcl-1.7.10.jar
+lib/rjack-slf4j/slf4j-jdk14-1.7.10.jar
+lib/rjack-slf4j/slf4j-log4j12-1.7.10.jar
+lib/rjack-slf4j/slf4j-nop-1.7.10.jar
+lib/rjack-slf4j/slf4j-simple-1.7.10.jar

data/README.rdoc

@@ -37,7 +37,7 @@ components in a JRuby application.
 
 === rjack-slf4j gem
 
-Copyright (c) 2008-2014 David Kellum
+Copyright (c) 2008-2015 David Kellum
 All rights reserved.
 
 The SLF4J ruby wrapper and gem packaging is released under the same

data/lib/rjack-slf4j.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2014 David Kellum
+# Copyright (c) 2008-2015 David Kellum
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -123,12 +123,28 @@ module RJack
     @@api_loader = org.slf4j.ILoggerFactory.java_class.class_loader
     @@loaded = {}
     @@output_name = nil
+    @@ruby_ex_format = "%s %s: %s\n".freeze
 
     # Output adapter name if one has been added, or nil.
     def self.output_name
       @@output_name
     end
 
+    # A (sprintf) format string to use when synthesizing a log message
+    # from a prefix message (msg) (i.e. "Exception:") and ruby
+    # exception (ex) using [ msg, ex.class.name, ex.cause ]. Since
+    # ruby exceptions aren't instances of java Throwable, they can't
+    # be passed directly. This can be globally set to match the
+    # formatting of the output adapter (i.e. for java exceptions),
+    # preferably in the same place it is required and configured.
+    def self.ruby_ex_format
+      @@ruby_ex_format
+    end
+
+    def self.ruby_ex_format=( f )
+      @@ruby_ex_format = f.dup.freeze
+    end
+
     # SLF4J severity levels
     LEVELS = %w{ trace debug info warn error }
 
@@ -208,7 +224,8 @@ module RJack
           end
 
           def #{lvl}( msg=nil, ex=nil )
-            if msg.is_a?( Exception ) && ex.nil?
+            if ex.nil? && ( msg.is_a?( Exception ) ||
+                            msg.is_a?( java.lang.Throwable ) )
               msg, ex = "Exception:", msg
             end
             msg = yield if ( block_given? && #{lvl}? )
@@ -223,16 +240,17 @@ module RJack
           end
 
           def #{lvl}_ex( msg, ex )
-            if ex.is_a?( NativeException )
+            if ex.is_a?( java.lang.Throwable )
+              @logger.#{lvl}( msg.to_s, ex )
+            elsif ex.is_a?( NativeException )
               @logger.#{lvl}( msg.to_s, ex.cause )
             elsif #{lvl}?
-              log = msg.to_s.dup
-              log << '\n'
-              log << ex.class.name << ': ' << ex.message << '\n'
+              lm = sprintf( SLF4J.ruby_ex_format,
+                            msg, ex.class.name, ex.message )
               ex.backtrace && ex.backtrace.each do |b|
-                log << '\t' << b << '\n'
+                lm << '\t' << b << '\n'
               end
-              @logger.#{lvl}( log )
+              @logger.#{lvl}( lm )
             end
             true
           end

data/lib/rjack-slf4j/base.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2014 David Kellum
+# Copyright (c) 2008-2015 David Kellum
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -26,9 +26,9 @@ module RJack
   module SLF4J
 
     # SLF4J-java version
-    SLF4J_VERSION = '1.7.7'
+    SLF4J_VERSION = '1.7.10'
     # SLF4J gem version
-    VERSION = SLF4J_VERSION + '.1'
+    VERSION = SLF4J_VERSION + '.0'
 
     SLF4J_DIR = File.dirname(__FILE__) # :nodoc:
 

data/lib/rjack-slf4j/jul-to-slf4j.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2014 David Kellum
+# Copyright (c) 2008-2015 David Kellum
 # All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining

data/lib/rjack-slf4j/jul.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2014 David Kellum
+# Copyright (c) 2008-2015 David Kellum
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files

data/lib/rjack-slf4j/mdc.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2008-2014 David Kellum
+# Copyright (c) 2008-2015 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/pom.xml

@@ -16,34 +16,34 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.7</version>
+      <version>1.7.10</version>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.7.7</version>
+      <version>1.7.10</version>
       <scope>runtime</scope>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jul-to-slf4j</artifactId>
-      <version>1.7.7</version>
+      <version>1.7.10</version>
       <scope>runtime</scope>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>log4j-over-slf4j</artifactId>
-      <version>1.7.7</version>
+      <version>1.7.10</version>
       <scope>runtime</scope>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-jdk14</artifactId>
-      <version>1.7.7</version>
+      <version>1.7.10</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.7.7</version>
+      <version>1.7.10</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-jcl</artifactId>
-      <version>1.7.7</version>
+      <version>1.7.10</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.7.7</version>
+      <version>1.7.10</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-nop</artifactId>
-      <version>1.7.7</version>
+      <version>1.7.10</version>
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>

data/test/example_jul_to_slf4j.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env jruby
 #--
-# Copyright (c) 2008-2014 David Kellum
+# Copyright (c) 2008-2015 David Kellum
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files

data/test/test_slf4j.rb

@@ -2,7 +2,7 @@
 #.hashdot.profile += jruby-shortlived
 
 #--
-# Copyright (c) 2008-2014 David Kellum
+# Copyright (c) 2008-2015 David Kellum
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -81,6 +81,7 @@ class TestSlf4j < MiniTest::Unit::TestCase
     @jdk_logger = JdkLogger.getLogger ""
     @jdk_logger.addHandler @handler
     @jdk_logger.level = java.util.logging.Level::INFO
+    SLF4J.ruby_ex_format = "%s\n%s: %s\n".freeze
     @log = SLF4J[ "my.app" ]
   end
 
@@ -115,7 +116,15 @@ class TestSlf4j < MiniTest::Unit::TestCase
       @log.error( "test java exception", x )
     end
     assert_equal( 1, @handler.count )
-    assert_same( ex.cause, @handler.last.thrown )
+    if ex.cause #old NativeException jruby 1.6.x case
+      assert_same( ex.cause, @handler.last.thrown )
+    else
+      assert_same( ex, @handler.last.thrown )
+    end
+
+    mlines = @handler.last.message.split($/)
+    assert_equal( 1, mlines.length )
+    assert_equal( "test java exception", mlines[0] )
   end
 
   def test_ruby_exception
@@ -135,6 +144,9 @@ class TestSlf4j < MiniTest::Unit::TestCase
       @log.error( msg, x )
     end
     assert_equal( 1, @handler.count )
+    mlines = @handler.last.message.split($/)
+    assert_equal( "my message", mlines[0] )
+    assert_match( /^ZeroDivisionError: /, mlines[1] )
   end
 
   def test_ruby_exception_block

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: rjack-slf4j
 version: !ruby/object:Gem::Version
-  version: 1.7.7.1
+  version: 1.7.10.0
 platform: java
 authors:
 - David Kellum
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2015-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.7.4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.7.4
+  name: minitest
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rdoc
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.7.4
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.1
+  name: rdoc
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rjack-tarpit
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 4.0.1
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
+  name: rjack-tarpit
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: A JRuby adaption and gem packaging of the Simple Logging Facade for Java. Provides all jar dependencies and a Ruby Logger compatible facade.
 email:
 - dek-oss@gravitext.com
@@ -81,15 +81,15 @@ files:
 - lib/rjack-slf4j/log4j12.rb
 - lib/rjack-slf4j/nop.rb
 - lib/rjack-slf4j/simple.rb
-- lib/rjack-slf4j/jcl-over-slf4j-1.7.7.jar
-- lib/rjack-slf4j/jul-to-slf4j-1.7.7.jar
-- lib/rjack-slf4j/log4j-over-slf4j-1.7.7.jar
-- lib/rjack-slf4j/slf4j-api-1.7.7.jar
-- lib/rjack-slf4j/slf4j-jcl-1.7.7.jar
-- lib/rjack-slf4j/slf4j-jdk14-1.7.7.jar
-- lib/rjack-slf4j/slf4j-log4j12-1.7.7.jar
-- lib/rjack-slf4j/slf4j-nop-1.7.7.jar
-- lib/rjack-slf4j/slf4j-simple-1.7.7.jar
+- lib/rjack-slf4j/jcl-over-slf4j-1.7.10.jar
+- lib/rjack-slf4j/jul-to-slf4j-1.7.10.jar
+- lib/rjack-slf4j/log4j-over-slf4j-1.7.10.jar
+- lib/rjack-slf4j/slf4j-api-1.7.10.jar
+- lib/rjack-slf4j/slf4j-jcl-1.7.10.jar
+- lib/rjack-slf4j/slf4j-jdk14-1.7.10.jar
+- lib/rjack-slf4j/slf4j-log4j12-1.7.10.jar
+- lib/rjack-slf4j/slf4j-nop-1.7.10.jar
+- lib/rjack-slf4j/slf4j-simple-1.7.10.jar
 homepage: http://rjack.gravitext.com/slf4j
 licenses: []
 metadata: {}