dlogger 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af1bd8fdd7d791b39c4fe3d106a8df1db5ab0f74
-  data.tar.gz: 94c6a2f737b107d8885a5c3e0a691fbf54e86b7a
+  metadata.gz: a66b797653f4bdb8bd82f224a9c5db694a67b935
+  data.tar.gz: cbd43d32888668b98b1a1e2f7abb9b03df6208bb
 SHA512:
-  metadata.gz: 856eb08a81421676af540cc839491c60b2b10cbdccc977c38ff36ff056d3ead02f70fbecdb71a3a1761e60623a0eefaeb457035e9a6a5f00c3d2978ae7672918
-  data.tar.gz: 56dca1e86e6a402c54226c49be0a64fea832e260f0474bd32efef966ab901c4fae1860150a2b3f29ba3d11a50d7bd076e00f78d2a098eef7ca58676a82ecbe6f
+  metadata.gz: 310fc64c152285818a836014ca4a54ff4eed34f953beab9a3f922d06329d2c4b9185fd42e518c381db63ea944eb604af51d723dd9563d31052abe1a435078faf
+  data.tar.gz: 829ce6c67279160ededa757b2befc52693223bd2ccb7fc179421afefe8d08e8073e05f5b5338f23b57923616c577329b066be69b4ee5e8b2c2c2e6c68017c5c1

data/Gemfile

@@ -7,6 +7,8 @@ gem 'eventmachine', '~> 1.0.0.rc.1'
 gem 'em-http-request'
 gem 'yajl-ruby'
 
+gem 'syslog_protocol', github: 'newrelic-forks/syslog_protocol'
+
 group(:test) do
   gem 'rake'
   

data/lib/dlogger/logger.rb

@@ -7,7 +7,7 @@ module DLogger
       @outputs = []
       
       # initialize context
-      context
+      init_context
     end
     
     ##
@@ -110,11 +110,15 @@ 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/logstash.rb

@@ -1,5 +1,5 @@
 gem 'eventmachine'; require 'eventmachine'
-gem 'yajl-ruby';    require 'yajl'
+gem 'multi_json'; require 'multi_json'
 
 module DLogger
   module Output
@@ -31,9 +31,9 @@ module DLogger
       
       def dispatch(msg, metadata)
         metadata = metadata.merge(:message => msg)
-        @socket.send_data( Yajl::Encoder.encode(metadata) + "\n" )
+        @socket.send_data( MultiJson.encode(metadata) + "\n" )
       end
     end
     
   end
-end
+end

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

@@ -0,0 +1,37 @@
+gem 'eventmachine'; require 'eventmachine'
+gem 'multi_json'; require 'multi_json'
+gem 'syslog_protocol'; require 'syslog_protocol'
+
+module DLogger
+  module Output
+    
+    ##
+    # This is not strictly a standard syslog output but it is designed
+    # to be used with rsyslog as a pass trhough to send data to elasticsearch
+    #
+    class Syslog < Base
+      def initialize(host, port, bind_address: '0.0.0.0')
+        @host         = host
+        @port         = port
+        
+        @socket = EM::open_datagram_socket(bind_address, 0)
+      end
+            
+      def dispatch(msg, metadata)
+        metadata = metadata.merge(message: msg)
+        
+        p = SyslogProtocol::Packet.new
+        p.hostname  = "unused"
+        p.facility  = "kern"
+        p.severity  = "info"
+        p.tag       = "app"
+        p.content   = MultiJson.encode(metadata)
+        
+        @socket.send_datagram(p.to_s, @host, @port)
+      end
+      
+    end
+    
+  end
+end
+  

data/lib/dlogger/version.rb

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

data/specs/lib/logger_spec.rb

@@ -47,6 +47,21 @@ describe "Logger" do
       
     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')
+      
+      @logger.push_context(global: 'A')
+      @logger.log('msg1', id: 43)
+      
+      @logger.with_context(user: ->{ "john" } ) do
+        @logger.log('msg2', id: 43)
+      end
+      
+      @logger.log('msg3', id: 43)
+    end
+    
   end
   
   describe 'with extension context' do

data/specs/lib/outputs/em/syslog_spec.rb

@@ -0,0 +1,39 @@
+require_relative "../../../common"
+
+require 'dlogger/outputs/em/syslog'
+
+$n = 0
+
+describe "Syslog Output" do
+  before do
+    @port = 4000 + ($n += 1)
+    @received_data = ""
+    
+    tmp = @received_data
+    
+    @handler_class = Class.new(EM::Connection) do
+      define_method(:receive_data) do |data|
+        tmp << data
+      end
+    end
+    
+    
+    # @server = EM::start_server('127.0.0.1', @port, @handler_class)
+    @server = EM::open_datagram_socket('127.0.0.1', @port, @handler_class)
+    
+    @logger = DLogger::Output::Syslog.new('127.0.0.1', @port)
+  end
+  
+  should 'send message to syslog via UDP' do
+    t = "Apr 15 16:46:32"
+    
+    freeze_time(Time.parse(t)) do
+      @logger.dispatch('a log message', {:data => "something", :n => 21})
+      
+      wait(0.1) do
+        @received_data.should == %{<6>#{t} unused app: {"data":"something","n":21,"message":"a log message"}}
+      end
+    end
+  end
+  
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dlogger
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Julien Ammous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies: []
 description: Advanced logger allowing you to include metadata with your messages
 email:
@@ -17,7 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - ChangeLog
 - Gemfile
 - Guardfile
@@ -39,6 +39,7 @@ files:
 - lib/dlogger/outputs/base.rb
 - lib/dlogger/outputs/em/logstash.rb
 - lib/dlogger/outputs/em/splunkstorm.rb
+- lib/dlogger/outputs/em/syslog.rb
 - lib/dlogger/outputs/stdlib_logger.rb
 - lib/dlogger/outputs/stdout.rb
 - lib/dlogger/version.rb
@@ -47,6 +48,7 @@ files:
 - specs/lib/logger_spec.rb
 - specs/lib/outputs/em/logstash_spec.rb
 - specs/lib/outputs/em/splunkstorm_spec.rb
+- specs/lib/outputs/em/syslog_spec.rb
 - specs/lib/outputs/stdlib_logger_spec.rb
 - specs/lib/outputs/stdout_spec.rb
 homepage: ''
@@ -58,17 +60,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: 'Dynamic logger: add a context to your log messages'