contextual_logger 1.2.0.colin.1 → 1.2.0.colin.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68939d6780d99c6d6a266aa6bcf10c4d457b27bb34bf2dc06b8faacf26aec1bd
-  data.tar.gz: c90bc720ec41a2d61a177243c815c109f16d631db1251ea03497d80bd2b6e22e
+  metadata.gz: 7bd0747cf5faa06b9907d60198830c374f83f226df121efa9a0b7049315f9132
+  data.tar.gz: 808bbac948431f55a8f4a07532884f3ed310a63652c536512aa5dd435454c6fb
 SHA512:
-  metadata.gz: a86dbe5c5f407d2affc7a4a58e237e0b61cb36db5dceb33db62bf3e01cb94e5f4e9863a3ac79765c02e5bb02d682246a854a71d5c102d390f1b6cb759faf5d79
-  data.tar.gz: 7376b31fbb12bce7a87f506a3c2f0ad89a5fe92c925cd9b469f176195ecfe21fa235a2a168ca9fcd43a42e7c7db7a56649aa5d02fa3d430ccc1108e710aa0ab7
+  metadata.gz: f3607fbfd8f6ddbc8b3b29943fd4787c16509997262b2d3ae309d41471d013da89ef76585d804775721ce1ac9fe75260a9eaf356ffee1cacc9bf2fc65ed4b273
+  data.tar.gz: 3e929c9f55c3bd12a1b65ba3e5135c1e56f5dc87b1597b3a6da9adfcc038f47bd0b8e2a01f9b6d294bfca549d681bef8a9cf67482771e6e4d0aa1db6d86e137b

data/lib/contextual_logger/context.rb

@@ -7,12 +7,12 @@ module ContextualLogger
       @thread_context_for_logger_instance ||= "ContextualLogger::Context.context_for_#{object_id}".to_sym
     end
 
-    def current_context
+    def current_context_override
       Thread.current[thread_context_for_logger_instance]
     end
 
-    def current_context=(context)
-      Thread.current[thread_context_for_logger_instance] = context.freeze
+    def current_context_override=(context_override)
+      Thread.current[thread_context_for_logger_instance] = context_override.freeze
     end
   end
 end

data/lib/contextual_logger/context_handler.rb

@@ -2,13 +2,13 @@
 
 module ContextualLogger
   class ContextHandler
-    def initialize(instance, previous_context)
+    def initialize(instance, previous_context_override)
       @instance = instance
-      @previous_context = previous_context
+      @previous_context_override = previous_context_override
     end
 
     def reset!
-      @instance.current_context = @previous_context
+      @instance.current_context_override = @previous_context_override
     end
   end
 end

data/lib/contextual_logger/logger_with_context.rb

@@ -19,6 +19,10 @@ module ContextualLogger
       @merged_context_cache = {}  # so we don't have to merge every time
     end
 
+    def global_context
+      @logger.global_context
+    end
+
     def level
       @override_level || @logger.level
     end

data/lib/contextual_logger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ContextualLogger
-  VERSION = '1.2.0.colin.1'
+  VERSION = '1.2.0.colin.3'
 end

data/lib/contextual_logger.rb

@@ -56,22 +56,22 @@ module ContextualLogger
       @global_context = context.freeze
     end
 
-    def current_context_for_thread
-      current_context || global_context
+    def current_context
+      current_context_override || global_context
     end
 
     def with_context(context)
-      previous_context = current_context_for_thread
-      self.current_context = previous_context.deep_merge(context)
+      previous_context_override = current_context_override
+      self.current_context_override = current_context.deep_merge(context)
       if block_given?
         begin
           yield
         ensure
-          self.current_context = previous_context
+          self.current_context_override = previous_context_override
         end
       else
         # If no block given, return context handler to the caller so they can call reset! themselves.
-        ContextHandler.new(self, previous_context)
+        ContextHandler.new(self, previous_context_override)
       end
     end
 
@@ -124,7 +124,7 @@ module ContextualLogger
           message = arg1
           progname = arg2 || @progname
         end
-        write_entry_to_log(severity, Time.now, progname, message, context: current_context_for_thread.deep_merge(context))
+        write_entry_to_log(severity, Time.now, progname, message, context: current_context.deep_merge(context))
       end
 
       true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contextual_logger
 version: !ruby/object:Gem::Version
-  version: 1.2.0.colin.1
+  version: 1.2.0.colin.3
 platform: ruby
 authors:
 - James Ebentier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-31 00:00:00.000000000 Z
+date: 2023-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json