lumberjack 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f99bebd6bae1a0fbcb246d790f4d1bbeb846e181cf22b510c8fea8d5690a6a4b
-  data.tar.gz: 2d4143fadc5e9a937c1b7127a97cf7e4b670fef25498803c06892dc3e2b61d86
+  metadata.gz: 1b76516c0e871b68e2834d0517dd219eefd0985fd55894c48e8e8c4fa9e71be8
+  data.tar.gz: 2516f75995e1ca98a7d0daabf5ea71b1a3a2e4593966a955bac9bc66dea5827e
 SHA512:
-  metadata.gz: 8d0ed86f4b5bf743ce6bb27b40d927c4bb0bb261d00b20d11aea60d1eec83e9d58629dfadc7016fccc9ebd9a5f0c133d3d2145a3af2d48642e5ad445f954cd27
-  data.tar.gz: 4f52a145303bec079216a9230020b50dd95868bc90f8e0192e6948afd18ffb621d6165629dca7949a669c26c8e2c43d78a2f79c8fe6114ec3b9a2882784bcdb8
+  metadata.gz: a6df7a99b4b8bba7a694cdcb45053185b7f2d40bb18af18af354e0188eba00b2f04156536e0844c0ddc74e38e3661821e60b357d4eef8928a3de6bd2bf0af1da
+  data.tar.gz: ad698517a3a54969c582d6cb839c218894a89b301c137bf2bdc08889777d50343ca4ccaf26d4a40ae96bfd3601790481267729e15eadc4d8f2cc7abbc687fd06

data/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.0.2
+
+### Changed
+
+- Attempts to use the logger inside a logging call (e.g. from a in a formatter) will now print the log message to STDERR. Previously such log messages would be silently dropped in order to prevent infinite recursion.
+
+## 2.0.1
+
+### Fixed
+
+- Merge attributes in forked loggers in the correct order so that attributes from the forked logger override those from the parent logger.
+
 ## 2.0.0
 
 This is a major update with several breaking changes. See the [upgrade guide](UPGRADE_GUIDE.md) for details on breaking changes.

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.2

data/lib/lumberjack/forked_logger.rb

@@ -85,7 +85,7 @@ module Lumberjack
     # @api private
     def add_entry(severity, message, progname = nil, attributes = nil)
       parent_logger.with_level(level || Logger::DEBUG) do
-        attributes = merge_attributes(attributes, local_attributes)
+        attributes = merge_attributes(local_attributes, attributes)
         progname ||= self.progname
 
         if parent_logger.is_a?(ContextLogger)

data/lib/lumberjack/logger.rb

@@ -396,7 +396,12 @@ module Lumberjack
     # @api private
     def add_entry(severity, message, progname = nil, attributes = nil)
       return false unless device
-      return false if fiber_local&.logging
+
+      # Prevent infinite recursion if logging is attempted from within a logging call.
+      if fiber_local&.logging
+        log_to_stderr(severity, message)
+        return false
+      end
 
       severity = Severity.label_to_level(severity) unless severity.is_a?(Integer)
 
@@ -503,5 +508,11 @@ module Lumberjack
 
       positional_arg_count == 4 && !has_forbidden_args
     end
+
+    def log_to_stderr(severity, message)
+      severity = Severity.coerce(severity)
+      severity_label = Severity.level_to_label(severity)
+      $stderr.write("Recursive logging detected; you cannot write new log entries while logging other entries: #{severity_label} #{message}\n")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lumberjack
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Brian Durand