contextual_logger 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbfdcb361d858be644b0a951340dad6edff12332
-  data.tar.gz: d8cc55ed86702e8d8e8286957e46dc530c7a6929
+  metadata.gz: 2005c27e3db3c69146eeae90c5dd89f75f8ad56c
+  data.tar.gz: b7cb42a1aee422df6e2135d35d67c81202f944b3
 SHA512:
-  metadata.gz: f2ae28488fac46e563f8d76565ae4e0bd5955acb808fd47ffb148d569239c24335a76ce627bac1c525467e555171da8c02f76d8e51c841b25b56ca4692b1361a
-  data.tar.gz: 03b31344155b8980a67b12ea2f6c854bcd4b161565b554f682beb30a32f44b02ca2a67674ef6bbb0b86c1228edf0bbd0be6962a55b6f02ee41f72153480bdf96
+  metadata.gz: 877c0ab113f3d220c87670739c7fb1a0a242f5ebd73c54fcc2eb12227747a47d041c222394a1c2485ce22e8d40255362a9956922cd3b0a8328ca4eead73f2c3e
+  data.tar.gz: 3c201cbe9719e9f19c31e7f3f8c3960ba37eb8099df2e808a7704b27a728ca9d2640173bd02afc8165a4cc53ef9a72bda3d5fc3cc3b89ac5933f4680f6c072fd

data/lib/contextual_logger.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
+require 'active_support'
 require 'json'
+require_relative './contextual_logger/context/handler'
 
 module ContextualLogger
   def self.new(logger)
@@ -8,19 +10,23 @@ module ContextualLogger
   end
 
   def global_context=(context)
-    Thread.current[THREAD_CONTEXT_NAMESPACE] = context
+    ContextualLogger::Context::Handler.new(context).set!
   end
 
   def with_context(context)
-    previous_context = Thread.current[THREAD_CONTEXT_NAMESPACE] || {}
-    Thread.current[THREAD_CONTEXT_NAMESPACE] = previous_context.merge(context)
-    yield if block_given?
+    context_handler = ContextualLogger::Context::Handler.new(current_context_for_thread.deep_merge(context))
+    context_handler.set!
+    if block_given?
+      yield
+    else
+      context_handler
+    end
   ensure
-    Thread.current[THREAD_CONTEXT_NAMESPACE] = previous_context
+    context_handler.reset! if block_given?
   end
 
   def current_context_for_thread
-    Thread.current[THREAD_CONTEXT_NAMESPACE] || {}
+    ContextualLogger::Context::Handler.current_context
   end
 
   def format_message(severity, timestamp, progname, message, context)
@@ -71,7 +77,7 @@ module ContextualLogger
         progname = @progname
       end
     end
-    write_entry_to_log(severity, Time.now, progname, message, current_context_for_thread.merge(extra_context || {}))
+    write_entry_to_log(severity, Time.now, progname, message, current_context_for_thread.deep_merge(extra_context || {}))
     true
   end
 
@@ -81,8 +87,6 @@ module ContextualLogger
 
   private
 
-  THREAD_CONTEXT_NAMESPACE = 'ContextualLoggerCurrentLoggingContext'
-
   def message_with_context(context, message, severity, timestamp, progname)
     context.merge(
       message: message,

data/lib/contextual_logger/context/handler.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module ContextualLogger
+  module Context
+    class Handler
+      THREAD_CONTEXT_NAMESPACE = 'ContextualLoggerCurrentLoggingContext'
+
+      attr_reader :previous_context, :context
+
+      def self.current_context
+        Thread.current[THREAD_CONTEXT_NAMESPACE] || {}
+      end
+
+      def initialize(context, previous_context: nil)
+        @previous_context = previous_context || self.class.current_context
+        @context = context
+      end
+
+      def set!
+        Thread.current[THREAD_CONTEXT_NAMESPACE] = context
+      end
+
+      def reset!
+        Thread.current[THREAD_CONTEXT_NAMESPACE] = previous_context
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contextual_logger
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - James Ebentier
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A way to add context to the logs you have
 email: jebentier@invoca.com
 executables: []
@@ -31,6 +45,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/contextual_logger.rb
+- lib/contextual_logger/context/handler.rb
 - lib/contextual_logger/overrides/active_support/tagged_logging/formatter.rb
 homepage: https://rubygems.org/gems/contextual_logger
 licenses: