logfoo 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20cf001c5de5bc751a19a54e61822b2b8e6d7678
-  data.tar.gz: a5358b0b639a320dccbfb99db611f7cdefa33a44
+  metadata.gz: b7598ba2df8e78ef3ee119a5d97a3cd0c98826db
+  data.tar.gz: d7c3785a015a5b1c2922be6df4b35c3ecc4b5586
 SHA512:
-  metadata.gz: a6572a35a7896368517490696d5c0331f755c918626b309ae901160b5618c20e40a90ed8c4ee8d3b575f22bdd4573df6bdb462db6f8995cb3e467497abcda728
-  data.tar.gz: 66d52280de4e7863bd2f296f5779ab664975ce9ef2700983bfb204dd4d89e5e8b3427bf98b03383cda4abaf5bd7452f29e8ec9181b74b23f9a9fb9731e3c8c00
+  metadata.gz: e48012c7d9ec1ebad5199544508a747e45f625c9ae63b82cd3ad97fc9c6c465a991d6e7b1cc69169bb0fa755e3926f4c11a883b582019b137bf8928ce7d77ee0
+  data.tar.gz: f27d853c96d28634a12c7d25938ad280c9414e6ef770128503b0e9312dc9ebcb98d5cadf682142b1542f03669376e43ae0207437bbb16574cf364e1e6b4a502d

data/lib/logfoo/context.rb

@@ -1,15 +1,14 @@
 module Logfoo
   class Context
 
-    THREAD_ID = :logfoo_context
-
-    attr_reader :level, :scope
+    attr_reader :level, :scope, :thread_id
 
     def initialize(app, scope, context = nil)
-      @app     = app
-      @scope   = scope
-      @level   = Logfoo::DEBUG
-      @context = context || {}
+      @app          = app
+      @scope        = scope
+      @thread_id    = :"logfoo_context_#{scope}"
+      @level        = Logfoo::DEBUG
+      @context      = context || {}
     end
 
     def level=(level)
@@ -28,13 +27,22 @@ module Logfoo
       if block_given?
         keys ||= {}
         begin
-          Thread.current[THREAD_ID] = keys
+          Thread.current[thread_id] ||= []
+          Thread.current[thread_id].push(keys)
           yield
         ensure
-          Thread.current[THREAD_ID] = nil
+          Thread.current[thread_id].pop
+          if Thread.current[thread_id] == []
+            Thread.current[thread_id] = nil
+          end
         end
       else
-        keys = Thread.current[THREAD_ID] || {}
+        keys = (Thread.current[thread_id] || []).inject({}) do |memo, kvs|
+          kvs.each do |(k,v)|
+            memo.merge!(k => v)
+          end
+          memo
+        end
         @context.merge(keys)
       end
     end

data/lib/logfoo/version.rb

@@ -1,3 +1,3 @@
 module Logfoo
-  VERSION = '0.0.14'
+  VERSION = '0.0.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logfoo
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler