dlogger 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8ce05b6a57259faf6e47835802be45e10c0d6bc
-  data.tar.gz: f7b1f2ee6802c792d1212892c2c16ac4c8d728e5
+  metadata.gz: 83c18123e6a73b53e44d03320171e283956614e7
+  data.tar.gz: 1af099b572aee8487cbf46dbc8cbba76659d47ba
 SHA512:
-  metadata.gz: 3f3b68c66d3ad642610c55518bbd1c4dd54185a3d4ae326952966d7df5574999bfe19eab3e13d82a8609db9c08859885eaff3ecfdd95482bc75fc54634207702
-  data.tar.gz: fa3477c2d0b3889beef5a437837b921a287910faf961a5888ed818ce5b2fe00ed0b5dbde08a96872f74997ef78d17a7037796537a711d6b65e6fa4dbd9174f83
+  metadata.gz: 892de0a86b92e6c98e59168c613fafa7b6f24061ab9bf37a30e3c23aa1532d619fbcc7de0f9d111e71002a01006fa8f1647d2828bcbcbc7436891341010b463b
+  data.tar.gz: 02d049557506e790790b407c4ac87c94ba945541ae81f159a10e1906b2b1f2f4309a075122a3c3ec979a02682ebe568f3246c42f94e7d479b129f4d6752a502d

data/lib/dlogger/logger.rb

@@ -8,7 +8,7 @@ module DLogger
     
     def initialize(name = "_default")
       @name = name
-      @outputs = []
+      @outputs = {}
       @global_context = {}
       @level = 0
     end
@@ -21,22 +21,16 @@ module DLogger
       end
     end
     
-    LOG_LEVELS.each.with_index do |name, index|
-      class_eval(%{
-          def #{name}?
-            #{index} >= @level
-          end
-        })
-    end
-    
     ##
     # Main entry point, log a message with
     # its metadata.
     # 
     # @param [String] msg the message
     # @param [Hash] metadata Additional data
+    # @param [Array] restrict If set the output will only be sent to these
+    #    outputs.
     # 
-    def log(msg, metadata = {})
+    def log(msg, metadata: {}, restrict: [])
       # clearing a small hash is slightly faster than creating a new
       # one each time.
       merged_metadata.clear
@@ -66,18 +60,26 @@ module DLogger
         end
       end
             
-      dispatch(msg, merged_metadata)
+      dispatch(msg, metadata: merged_metadata, restrict: restrict)
+    end
+    
+    def self.level_as_sym(level)
+      LOG_LEVELS[level]
     end
     
     # Helper methods to mimic the standard ruby logger interface.
-    %w(debug info error warn).each do |level|
-      class_eval %{
-        def #{level}(msg, metadata = {})
-          # metadata << [:severity, :#{level}]
-          metadata[:severity] = :#{level}
-          log(msg, metadata)
-        end
-      }
+    LOG_LEVELS.each.with_index do |name, index|
+      class_eval(%{
+          def #{name}?
+            #{index} >= @level
+          end
+          
+          def #{name}(msg, metadata: {}, restrict: [])
+            # metadata << [:severity, :#{name}]
+            metadata[:severity] = :#{name}
+            log(msg, metadata: metadata, restrict: restrict)
+          end
+        }, __FILE__, __LINE__)
     end
     
     ##
@@ -86,8 +88,8 @@ module DLogger
     # 
     # @param [Object] handler the handler
     # 
-    def add_output(handler)
-      @outputs << handler
+    def add_output(name, handler)
+      @outputs[name] = handler
     end
     
     
@@ -160,8 +162,14 @@ module DLogger
     # @param [Hash] metadata a hash including all the
     #   additional informations you want to make available
     # 
-    def dispatch(msg, metadata)
-      @outputs.each do |out|
+    def dispatch(msg, metadata: metadata, restrict:)
+      outputs = @outputs
+      
+      if restrict && (restrict.size > 0)
+        outputs = outputs.reject{|name, out| !restrict.include?(name) }
+      end
+      
+      outputs.each do |name, out|
         out.dispatch(msg, metadata)
       end
     end

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

@@ -16,7 +16,7 @@ module DLogger
         
         @socket = EM::open_datagram_socket(bind_address, 0)
       end
-            
+      
       def dispatch(msg, metadata)
         metadata = metadata.merge(message: msg)
         

data/lib/dlogger/version.rb

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

data/specs/lib/logger_spec.rb

@@ -3,29 +3,41 @@ require_relative "../common"
 describe "Logger" do
   before do
     @logger = DLogger::Logger.new("logger#{rand(200)}#{rand(200)}")
+    @output1 = mock('out1')
+    @logger.add_output(:out1, @output1)
   end
   
   should "dispatch msg with its to registered outputs" do
     
-    handler = mock('Handler')
-    handler.expects(:dispatch).with("the message", id: 43, user: 'bob')
+    @output1.expects(:dispatch).with("the message", id: 43, user: 'bob')
+    @logger.log("the message", metadata: { id: 43, user: "bob" })
+  end
+  
+  should 'dispatch only to specified output' do
+    @output1.expects(:dispatch).never
+    
+    out2 = mock('Output2')
+    out2.expects(:dispatch).with("the message", id: 43, user: 'bob')
     
-    @logger.add_output(handler)
+    @logger.add_output(:out2, out2)
     
-    @logger.log("the message", id: 43, user: "bob")
+    @logger.log("the message",
+        metadata: {id: 43, user: "bob"},
+        restrict: [:out2]
+      )
   end
   
   should 'mimic standard ruby logger interface' do
-    @logger.expects(:dispatch).with('the message', :severity => :debug)
+    @output1.expects(:dispatch).with('the message', :severity => :debug)
     @logger.debug("the message")
     
-    @logger.expects(:dispatch).with('the message', :severity => :info)
+    @output1.expects(:dispatch).with('the message', :severity => :info)
     @logger.info("the message")
     
-    @logger.expects(:dispatch).with('the message', :severity => :warn)
+    @output1.expects(:dispatch).with('the message', :severity => :warn)
     @logger.warn("the message")
     
-    @logger.expects(:dispatch).with('the message', :severity => :error)
+    @output1.expects(:dispatch).with('the message', :severity => :error)
     @logger.error("the message")
   end
   
@@ -45,35 +57,35 @@ describe "Logger" do
   
   describe 'with hash context' do
     should 'dispatch msg and merged data' do
-      @logger.expects(:dispatch).with('msg', id: 43, user: 'bob')
+      @output1.expects(:dispatch).with('msg', id: 43, user: 'bob')
     
       @logger.with_context(:user => 'bob') do
-        @logger.log('msg', id: 43)
+        @logger.log('msg', metadata: {id: 43})
       end
     end
     
     should 'allow proc as value' do
-      @logger.expects(:dispatch).with('msg', id: 43, user: 'john')
+      @output1.expects(:dispatch).with('msg', id: 43, user: 'john')
       
       @logger.with_context(user: ->{ "john" } ) do
-        @logger.log('msg', id: 43)
+        @logger.log('msg', metadata: {id: 43})
       end
       
     end
     
     should 'keep pushed context' do
-      @logger.expects(:dispatch).with('msg1', id: 43, global: 'A')
-      @logger.expects(:dispatch).with('msg2', id: 43, user: 'john', global: 'A')
-      @logger.expects(:dispatch).with('msg3', id: 43, global: 'A')
+      @output1.expects(:dispatch).with('msg1', id: 41, global: 'A')
+      @output1.expects(:dispatch).with('msg2', id: 42, user: 'john', global: 'A')
+      @output1.expects(:dispatch).with('msg3', id: 43, global: 'A')
       
       @logger.push_context(global: 'A')
-      @logger.log('msg1', id: 43)
+      @logger.log('msg1', metadata: {id: 41})
       
       @logger.with_context(user: ->{ "john" } ) do
-        @logger.log('msg2', id: 43)
+        @logger.log('msg2', metadata: {id: 42})
       end
       
-      @logger.log('msg3', id: 43)
+      @logger.log('msg3', metadata: {id: 43})
     end
     
   end
@@ -86,10 +98,10 @@ describe "Logger" do
         end
       end
       
-      @logger.expects(:dispatch).with('msg', id: 56, user: 'alice')
+      @output1.expects(:dispatch).with('msg', id: 56, user: 'alice')
     
       @logger.with_context(ext) do
-        @logger.log('msg', id: 56)
+        @logger.log('msg', metadata: {id: 56})
       end
     end
     
@@ -97,15 +109,15 @@ 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')
+      @output1.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.log('msg', metadata: {operation: "destroy"})
         end
       end
       
-      @logger.expects(:dispatch).with('some text', {})
+      @output1.expects(:dispatch).with('some text', {})
       @logger.log('some text')
     end
     
@@ -118,18 +130,18 @@ describe "Logger" do
     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)
+      @output1.expects(:dispatch).with('msg1', app: "back1", op: "add", fiber: 1)
+      @output1.expects(:dispatch).with('msg2', app: "back1", op: "sub", fiber: 2)
       
       Fiber.new{
         @logger.with_context(fiber: 1) do
-          @logger.log('msg1', op: 'add')
+          @logger.log('msg1', metadata: {op: 'add'})
         end
       }.resume
       
       Fiber.new{
         @logger.with_context(fiber: 2) do
-          @logger.log('msg2', op: 'sub')
+          @logger.log('msg2', metadata: {op: 'sub'})
         end
       }.resume
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dlogger
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Julien Ammous