contextual_logger 1.2.0.colin.2 → 1.2.0.colin.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa81557c8d0035dc91b9285be3a429b5c3bef9d27842f62306a827b3a842d284
-  data.tar.gz: f63ece3db1c77acda0f05ea7af4dc581aefff65bb62464977a8b9a645090fe9f
+  metadata.gz: 7b8180f031cfc4c1facc22a0cfbbadf8970b01a1b7c1d18f974dbf54fd1712d5
+  data.tar.gz: d310df13569303aa5f6964d1cf9f73583fcfcabcd5950f330b00a30f8eb151f5
 SHA512:
-  metadata.gz: 5dbfc7e625e0b8e9b7111371da8368194d8d628192f91955cc98807fb0e8ecc67e10473137c1333513376d233c112a990c8fe8e5506741322995433c4f75f62f
-  data.tar.gz: 966f798d247c5cadaa32e2269830153f7280e0ad015554db4f065c7a5f5729f5f39b3f443dde6f8f4659797da218ede4af320ac278723651099c2e8f2495e877
+  metadata.gz: e0c0350c9f36cf27071a7e1da1f42363979852304c4b029ca24d0a550c77bfb403815dc09420d5c8d9c164b003f8a22213e5d33216e1647ae63143a3b73447e9
+  data.tar.gz: 4984642ce8b36e78c3f14f0415ac95d67dec97f9f5651f6c63deb715bbfa27134243f7286e09802146b6629df0bc1077c476ea3e3d5ad783779daa718aef032d

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/version.rb

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

data/lib/contextual_logger.rb

@@ -56,22 +56,25 @@ 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
 
+    # TODO: Deprecate current_context_for_thread in v2.0.
+    alias current_context_for_thread current_context
+
     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 +127,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.2
+  version: 1.2.0.colin.4
 platform: ruby
 authors:
 - James Ebentier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-31 00:00:00.000000000 Z
+date: 2023-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json