lumberjack 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 937acfbe9675acf0eecd3fa034e0818952967b00471e365d2ea3f0ab7fafa4d1
-  data.tar.gz: 0b82a010a7c4265c92cec3e7d5b0ffcb5f4ac5e151c7e1e8ee28ac8d0b3adf9b
+  metadata.gz: 6869d51bf38cc7ee1aad46005d947c5313bf58064da86cbd44ab5ca69dd04a71
+  data.tar.gz: 2817b2ace992f96770a16f1f5d6133a06f1e7277dfe236deb31d8fcad9934d39
 SHA512:
-  metadata.gz: 42d94b2e4c35ded1291262acf02e3d886c9b5acc2d26bd40d5d6884ebced0658d8b7baeb83aa402f700a294cbdba05491aaabff4d9f7df9bb03c5edd3954f2a4
-  data.tar.gz: 2ddcf64ed40c77e57cc8152aba8241c6f92c2668d3a6f6aa58c674e46e35cb0e1a78491d24588d67fbdc13d1ce9904c5a200426948367fe8d9ef4b50bd00b23e
+  metadata.gz: 6419348e19de6901892b35118ebc4405a773706b817d5c3c443f733973a977ad3be171b1f736b81334d9173cae5271799e267917284d3a28459349bc0cfc76f7
+  data.tar.gz: 5dca009d8cc55ea4044e9eba50df1ebba04351d019c3322b733ae01fc0d250f29d3a9f625c67da3549a0a7ebf8487a465f1ff4cca1ccfccf662f1cbccc4629cd

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.1
+
+* Replace Procs in tag values with the value of calling the Proc in log entries.
+
 ## 1.1.0
 
 * Change Lumberjack::Logger to inherit from ::Logger

data/README.md

@@ -63,6 +63,16 @@ end
 logger.info("there") # Will not include the `thread_id` tag
 ```
 
+You can also set tags to `Proc` objects that will be evaluated when creating a log entry.
+
+```ruby
+logger.tag(thread_id: lambda { Thread.current.object_id })
+Thread.new do
+  logger.info("inside thread") # Will include the `thread_id` tag with id of the spawned thread
+end
+logger.info("outside thread") # Will include the `thread_id` tag with id of the main thread
+```
+
 Finally, you can specify a logging context with tags that apply within a block to all loggers.
 
 ```ruby

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/lumberjack/logger.rb

@@ -153,6 +153,7 @@ module Lumberjack
           tags = current_tags.merge(Tags.stringify_keys(tags))
         end
       end
+      tags = Tags.expand_runtime_values(tags)
 
       entry = LogEntry.new(time, severity, message, progname, $$, tags)
       write_to_device(entry)

data/lib/lumberjack/tags.rb

@@ -19,6 +19,24 @@ module Lumberjack
           copy
         end
       end
+
+      # Ensure keys are strings and expand any values in a hash that are Proc's by calling them and replacing
+      # the value with the result. This allows setting global tags with runtime values.
+      def expand_runtime_values(hash)
+        return nil if hash.nil?
+        if hash.all? { |key, value| key.is_a?(String) && !value.is_a?(Proc) }
+          return hash
+        end
+        
+        copy = {}
+        hash.each do |key, value|
+          if value.is_a?(Proc) && (value.arity == 0 || value.arity == -1)
+            value = value.call
+          end
+          copy[key.to_s] = value
+        end
+        copy
+      end
     end
   end
 end

metadata

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