logging 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee30a5922d46012d8fc4e14db5cc86ea7dce9c6a
-  data.tar.gz: 7183a4f01f0dd1000ab86d05c8b40e605dbb4b10
+  metadata.gz: c4be0dd542e3eac91b3ad7f7895e7a0dbfdadd66
+  data.tar.gz: 960c2a5e039c3f455f29dd6bf4fe3a700957194b
 SHA512:
-  metadata.gz: 377702172ae965d27c082acd60914e0f3420a0e0bdfc5d981ac3cfad7c8f3bf46095007511075b6a9db9225963911967d3d63989a3ee6dc42588269092796a72
-  data.tar.gz: 1a6f33f20259879ca8cc9adcbd9a3bfb14c44f03a15311711f11ff4bf98edfd9821000e8b9afcb5401080a693e391bb83e56bd0055e1eedcbba6ce7ba4a92f2b
+  metadata.gz: ab8acc6f8f984c8533c667c73fffb4b6e5286d1a401af2989ca1d1e0a4beac3b2147abf9c87dcf52339e32da1be8b3db41d770acb9c38c40e84c07e50b3e9776
+  data.tar.gz: 2bdab15e9bfb48a5b3a30214bdaf375b2536dac54a334ee27ca8fafbda1ba6068a6a0aff1a91524eadd10d22525a5607eb41eacf3fc8e8d69402b08fd5ec73df

data/.travis.yml

@@ -8,7 +8,7 @@ script: "rake"
 rvm:
   - 2.0.0-p648
   - 2.1.10
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
   - jruby-9.1.8.0

data/History.txt

@@ -1,3 +1,8 @@
+== 2.2.1 / 2017-04-09
+
+Enhancements
+- show exception `cause` if one exists [PR #165]
+
 == 2.2.0 / 2017-03-09
 
 Enhancements

data/lib/logging/layout.rb

@@ -142,11 +142,15 @@ class Layout
     case obj
     when String; obj
     when Exception
-      str = "<#{obj.class.name}> #{obj.message}"
+      ary = ["<#{obj.class.name}> #{obj.message}"]
       if backtrace? && !obj.backtrace.nil?
-        str << "\n\t" << obj.backtrace.join("\n\t")
+        ary.concat(obj.backtrace)
       end
-      str
+      if defined?(obj.cause) && !obj.cause.nil?
+        ary << "--- Caused by ---"
+        ary << format_obj(obj.cause)
+      end
+      ary.join("\n\t")
     when nil; "<#{obj.class.name}> nil"
     else
       str = "<#{obj.class.name}> "

data/lib/logging/layouts/parseable.rb

@@ -221,7 +221,8 @@ module Logging::Layouts
       when Exception
         h = { :class   => obj.class.name,
               :message => obj.message }
-        h[:backtrace] = obj.backtrace if @backtrace && !obj.backtrace.nil?
+        h[:backtrace] = obj.backtrace if backtrace? && !obj.backtrace.nil?
+        h[:cause] = format_obj(obj.cause) if defined?(obj.cause) && !obj.cause.nil?
         h
       when Time
         iso8601_format(obj)

data/lib/logging/version.rb

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

data/test/layouts/test_nested_exceptions.rb

@@ -0,0 +1,52 @@
+
+require_relative '../setup'
+
+module TestLogging
+  module TestLayouts
+    class TestNestedExceptions < Test::Unit::TestCase
+      include LoggingTestCase
+
+      def test_basic_format_obj
+        begin
+          raise StandardError, 'nested exception'
+        rescue
+          raise Exception, 'root exception'
+        end
+      rescue Exception => e
+        layout = Logging.layouts.basic({})
+        log = layout.format_obj(e)
+        assert_not_nil log.index('<Exception> root exception')
+
+        if defined? e.cause
+          assert_not_nil log.index('<StandardError> nested exception')
+          assert_operator log.index('<Exception> root exception'), :<, log.index('<StandardError> nested exception')
+        end
+      end
+
+      def test_parseable_format_obj
+        begin
+          raise StandardError, 'nested exception'
+        rescue
+          raise Exception, 'root exception'
+        end
+      rescue Exception => e
+        layout = Logging.layouts.parseable.new
+        log = layout.format_obj(e)
+        assert_equal Exception.name, log[:class]
+        assert_equal 'root exception', log[:message]
+        assert_operator log[:backtrace].size, :>, 0
+
+        if defined? e.cause
+          assert_not_nil log[:cause]
+
+          log = log[:cause]
+          assert_equal StandardError.name, log[:class]
+          assert_equal 'nested exception', log[:message]
+          assert_nil log[:cause]
+          assert_operator log[:backtrace].size, :>, 0
+        end
+      end
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logging
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Tim Pease
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: little-plugger
@@ -158,6 +158,7 @@ files:
 - test/layouts/test_basic.rb
 - test/layouts/test_color_pattern.rb
 - test/layouts/test_json.rb
+- test/layouts/test_nested_exceptions.rb
 - test/layouts/test_pattern.rb
 - test/layouts/test_yaml.rb
 - test/performance.rb
@@ -196,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: logging
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A flexible and extendable logging library for Ruby
@@ -212,6 +213,7 @@ test_files:
 - test/layouts/test_basic.rb
 - test/layouts/test_color_pattern.rb
 - test/layouts/test_json.rb
+- test/layouts/test_nested_exceptions.rb
 - test/layouts/test_pattern.rb
 - test/layouts/test_yaml.rb
 - test/test_appender.rb