lumberjack 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10f2db93994b2941a8684c4fd933f07fc2d0067afdcfa3798f4ba3b5cc34b354
-  data.tar.gz: e6413b5b475b1c05ffcc17662e4f553af8e6d47d79e961a5802d0d875a413f9e
+  metadata.gz: 72793f91350cf3b30baede6fb2463d4c3456767445997ea9575a9914e81b5064
+  data.tar.gz: e26eb87f8ce64b37010728c650a3c152ca8e79f068af057f37053aabfdff7e5a
 SHA512:
-  metadata.gz: 809fc20f5cb8cc7d704f5a5e6878f321285953c8c79139fbd9892fa6c954b645b6bdcc0ce0e0265e18b29974fd864a96fdd735a424f57bd1224653759b139fd8
-  data.tar.gz: c7cf6e570fe6a1cbba068905ad860c26ad375b5f413d449c8f77f84c4ad81b139585ef2917aa2328dac2b80e0a3f962895a5efb8c5b988a14605e59ccf6eafbc
+  metadata.gz: d432507622e800253e8533f2effa884c00cb890acc4fe94031b5b65c811737f544c1cf6174b90d7dc328e62654a6258e6ebd327a7e5e64a8958484579977c2d3
+  data.tar.gz: af4aee97287aa70c9af2a655ac55ccf38d39a9469d5aedffab3452365b26c89b184fad05a483611b3a500e1af89f1c33b2a23343d70112694f735ae02927189c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.2.1
+
+* Prevent infinite loops where logging a statement triggers the logger.
+
 ## 1.2.0
 
 * Enable compatibility with ActiveSupport::TaggedLogger by calling `tagged_logger!` on a logger.

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/lib/lumberjack/logger.rb

@@ -156,32 +156,37 @@ module Lumberjack
     #   logger.add_entry(:warn, "Request took a long time")
     #   logger.add_entry(Logger::DEBUG){"Start processing with options #{options.inspect}"}
     def add_entry(severity, message, progname = nil, tags = nil)
-      severity = Severity.label_to_level(severity) unless severity.is_a?(Integer)
-
-      return true unless device && severity && severity >= level
-
-      time = Time.now
-      message = message.call if message.is_a?(Proc)
-      message = formatter.format(message)
-      progname ||= self.progname
-
-      current_tags = self.tags
-      tags = nil unless tags.is_a?(Hash)
-      if current_tags.empty?
-        tags = Tags.stringify_keys(tags) unless tags.nil?
-      else
-        if tags.nil?
-          tags = current_tags.dup
+      begin        
+        severity = Severity.label_to_level(severity) unless severity.is_a?(Integer)
+        return true unless device && severity && severity >= level
+        
+        return true if Thread.current[:lumberjack_logging]
+        Thread.current[:lumberjack_logging] = true
+
+        time = Time.now
+        message = message.call if message.is_a?(Proc)
+        message = formatter.format(message)
+        progname ||= self.progname
+
+        current_tags = self.tags
+        tags = nil unless tags.is_a?(Hash)
+        if current_tags.empty?
+          tags = Tags.stringify_keys(tags) unless tags.nil?
         else
-          tags = current_tags.merge(Tags.stringify_keys(tags))
+          if tags.nil?
+            tags = current_tags.dup
+          else
+            tags = current_tags.merge(Tags.stringify_keys(tags))
+          end
         end
-      end
-      tags = Tags.expand_runtime_values(tags)
-      tags = tag_formatter.format(tags) if tag_formatter
-
-      entry = LogEntry.new(time, severity, message, progname, $$, tags)
-      write_to_device(entry)
+        tags = Tags.expand_runtime_values(tags)
+        tags = tag_formatter.format(tags) if tag_formatter
 
+        entry = LogEntry.new(time, severity, message, progname, $$, tags)
+        write_to_device(entry)
+      ensure
+        Thread.current[:lumberjack_logging] = nil
+      end
       true
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lumberjack
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Brian Durand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec