dlogger 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a66b797653f4bdb8bd82f224a9c5db694a67b935
-  data.tar.gz: cbd43d32888668b98b1a1e2f7abb9b03df6208bb
+  metadata.gz: c8ce05b6a57259faf6e47835802be45e10c0d6bc
+  data.tar.gz: f7b1f2ee6802c792d1212892c2c16ac4c8d728e5
 SHA512:
-  metadata.gz: 310fc64c152285818a836014ca4a54ff4eed34f953beab9a3f922d06329d2c4b9185fd42e518c381db63ea944eb604af51d723dd9563d31052abe1a435078faf
-  data.tar.gz: 829ce6c67279160ededa757b2befc52693223bd2ccb7fc179421afefe8d08e8073e05f5b5338f23b57923616c577329b066be69b4ee5e8b2c2c2e6c68017c5c1
+  metadata.gz: 3f3b68c66d3ad642610c55518bbd1c4dd54185a3d4ae326952966d7df5574999bfe19eab3e13d82a8609db9c08859885eaff3ecfdd95482bc75fc54634207702
+  data.tar.gz: fa3477c2d0b3889beef5a437837b921a287910faf961a5888ed818ce5b2fe00ed0b5dbde08a96872f74997ef78d17a7037796537a711d6b65e6fa4dbd9174f83

data/lib/dlogger/logger.rb

@@ -2,12 +2,31 @@ require 'thread'
 
 module DLogger
   class Logger
+    LOG_LEVELS = [:debug, :info, :warn, :error].freeze
+    
+    attr_accessor :level
+    
     def initialize(name = "_default")
       @name = name
       @outputs = []
-      
-      # initialize context
-      init_context
+      @global_context = {}
+      @level = 0
+    end
+    
+    def level=(what)
+      if what.is_a?(Symbol)
+        @level = LOG_LEVELS.index(what)
+      else
+        rais "symbol expected"
+      end
+    end
+    
+    LOG_LEVELS.each.with_index do |name, index|
+      class_eval(%{
+          def #{name}?
+            #{index} >= @level
+          end
+        })
     end
     
     ##
@@ -21,6 +40,7 @@ module DLogger
       # clearing a small hash is slightly faster than creating a new
       # one each time.
       merged_metadata.clear
+      merged_metadata.merge!(@global_context)
     
       # first load context data
       context.each do |ctx_data|
@@ -70,6 +90,15 @@ module DLogger
       @outputs << handler
     end
     
+    
+    ##
+    # This will get merged in every context no matter which fiber
+    # they are in
+    # 
+    def add_to_global_context(h)
+      @global_context.merge!(h)
+    end
+    
     ##
     # Usually called by #with_context method but you can use
     # it directly to push a context on the stack, it may be useful
@@ -109,16 +138,12 @@ module DLogger
     
   
   private
-    
-    def init_context
-      Thread.current["#{@name}_dlogger_contexts"] = []
-    end
-    
+  
     ##
     # Store the context in fiber local variables, each
     # Thread/Fiber gets its own.
     def context
-      Thread.current["#{@name}_dlogger_contexts"]
+      Thread.current["#{@name}_dlogger_contexts"] ||= []
     end
     
     ##

data/lib/dlogger/outputs/em/syslog.rb

@@ -27,7 +27,11 @@ module DLogger
         p.tag       = "app"
         p.content   = MultiJson.encode(metadata)
         
-        @socket.send_datagram(p.to_s, @host, @port)
+        # do not raise an error if eventmachine is not running
+        # it might happen when shutting down
+        if EM.reactor_running?
+          @socket.send_datagram(p.to_s, @host, @port)
+        end
       end
       
     end

data/lib/dlogger/version.rb

@@ -1,3 +1,3 @@
 module Dlogger
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/specs/lib/logger_spec.rb

@@ -2,17 +2,17 @@ require_relative "../common"
 
 describe "Logger" do
   before do
-    @logger = DLogger::Logger.new
+    @logger = DLogger::Logger.new("logger#{rand(200)}#{rand(200)}")
   end
   
   should "dispatch msg with its to registered outputs" do
     
     handler = mock('Handler')
-    handler.expects(:dispatch).with("the message", :id => 43, :user => 'bob')
+    handler.expects(:dispatch).with("the message", id: 43, user: 'bob')
     
     @logger.add_output(handler)
     
-    @logger.log("the message", :id => 43, :user => "bob")
+    @logger.log("the message", id: 43, user: "bob")
   end
   
   should 'mimic standard ruby logger interface' do
@@ -29,20 +29,34 @@ describe "Logger" do
     @logger.error("the message")
   end
   
+  should 'implement level interface' do
+    @logger.level = :debug
+    @logger.debug?.should == true
+    @logger.info?.should == true
+    @logger.warn?.should == true
+    @logger.error?.should == true
+    
+    @logger.level = :warn
+    @logger.debug?.should == false
+    @logger.info?.should == false
+    @logger.warn?.should == true
+    @logger.error?.should == true
+  end
+  
   describe 'with hash context' do
     should 'dispatch msg and merged data' do
-      @logger.expects(:dispatch).with('msg', :id => 43, :user => 'bob')
+      @logger.expects(:dispatch).with('msg', id: 43, user: 'bob')
     
       @logger.with_context(:user => 'bob') do
-        @logger.log('msg', :id => 43)
+        @logger.log('msg', id: 43)
       end
     end
     
     should 'allow proc as value' do
-      @logger.expects(:dispatch).with('msg', :id => 43, :user => 'john')
+      @logger.expects(:dispatch).with('msg', id: 43, user: 'john')
       
-      @logger.with_context(:user => ->{ "john" } ) do
-        @logger.log('msg', :id => 43)
+      @logger.with_context(user: ->{ "john" } ) do
+        @logger.log('msg', id: 43)
       end
       
     end
@@ -72,10 +86,10 @@ describe "Logger" do
         end
       end
       
-      @logger.expects(:dispatch).with('msg', :id => 56, :user => 'alice')
+      @logger.expects(:dispatch).with('msg', id: 56, user: 'alice')
     
       @logger.with_context(ext) do
-        @logger.log('msg', :id => 56)
+        @logger.log('msg', id: 56)
       end
     end
     
@@ -83,11 +97,11 @@ describe "Logger" do
   
   describe 'with multiple contexts' do
     should 'merge the contexts in defined order (last defined has greater priority)' do
-      @logger.expects(:dispatch).with('msg', :operation => 'destroy', :user => 'billy')
+      @logger.expects(:dispatch).with('msg', operation: 'destroy', user: 'billy')
       
-      @logger.with_context(:user => 'bob') do
-        @logger.with_context(:user => 'billy') do
-          @logger.log('msg', :operation => "destroy")
+      @logger.with_context(user: 'bob') do
+        @logger.with_context(user: 'billy') do
+          @logger.log('msg', operation: "destroy")
         end
       end
       
@@ -97,4 +111,29 @@ describe "Logger" do
     
   end
   
+  
+  describe 'multiple concurrent contexts' do
+    before do
+      @logger.add_to_global_context(app: "back1")
+    end
+    
+    should 'include global context in log' do
+      @logger.expects(:dispatch).with('msg1', app: "back1", op: "add", fiber: 1)
+      @logger.expects(:dispatch).with('msg2', app: "back1", op: "sub", fiber: 2)
+      
+      Fiber.new{
+        @logger.with_context(fiber: 1) do
+          @logger.log('msg1', op: 'add')
+        end
+      }.resume
+      
+      Fiber.new{
+        @logger.with_context(fiber: 2) do
+          @logger.log('msg2', op: 'sub')
+        end
+      }.resume
+      
+    end
+  end
+  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dlogger
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Julien Ammous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies: []
 description: Advanced logger allowing you to include metadata with your messages
 email: