dlogger 0.0.2 → 0.0.3

data/ChangeLog

@@ -0,0 +1,4 @@
+
+= 0.0.3
+
+- Added SplunkStorm output

data/Gemfile

@@ -3,11 +3,17 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in dlogger.gemspec
 gemspec
 
-gem 'eventmachine', '~> 1.0.0.beta'
+gem 'eventmachine', '~> 1.0.0.rc.1'
+gem 'em-http-request'
 gem 'yajl-ruby'
 
 group(:test) do
-  gem 'schmurfy-bacon', '~> 1.2.1'
+  gem 'rake'
+  
+  gem 'thin'
+  gem 'em-synchrony'
+  
+  gem 'schmurfy-bacon', '~> 1.4.1'
   gem 'mocha',          '~> 0.10.0'
   gem 'simplecov'
   gem 'schmurfy-em-spec'
@@ -15,5 +21,8 @@ group(:test) do
   gem 'guard-bacon'
   gem 'rb-fsevent'
   gem 'growl'
+  
+  gem 'tilt'
+  gem 'guard-tilt'
 end
 

data/dlogger.gemspec

@@ -14,8 +14,4 @@ Gem::Specification.new do |gem|
   gem.name          = "dlogger"
   gem.require_paths = ["lib"]
   gem.version       = Dlogger::VERSION
-  
-  gem.add_development_dependency('rake')
-  gem.add_development_dependency('tilt')
-  gem.add_development_dependency('guard-tilt')
 end

data/examples/splunk.rb

@@ -0,0 +1,27 @@
+require 'rubygems'
+require 'eventmachine'
+require 'em-http-request'
+require 'yajl'
+
+require 'bundler/setup'
+
+require 'dlogger'
+require 'dlogger/outputs/em/splunkstorm'
+
+logger = DLogger::Logger.new
+logger.add_output( DLogger::Output::Stdout.new )
+
+EM::run do
+  
+  logger.add_output( DLogger::Output::SplunkStorm.new('http://api.splunkstorm.com',
+      :host         => 'test.local',
+      :project      => 'xxx',
+      :access_token => 'yyy'
+    ))
+  
+  n = 0
+  EM::add_periodic_timer(2) do
+    logger.log("yeah it worked", :n => n+= 1)
+  end
+end
+

data/lib/dlogger/logger.rb

@@ -4,7 +4,6 @@ module DLogger
   class Logger
     def initialize(name = "_default")
       @name = name
-      @mutex = Mutex.new
       @outputs = []
       
       # initialize context
@@ -19,38 +18,40 @@ module DLogger
     # @param [Hash] metadata Additional data
     # 
     def log(msg, metadata = {})
-      @mutex.synchronize do
-        # clearing a small hash is slightly faster than creating a new
-        # one each time.
-        merged_metadata.clear
-      
-        # first load context data
-        context.each do |ctx_data|
-          case ctx_data
-          when Hash
-            merged_metadata.merge!(ctx_data)
-          
-          when Extension
-            ctx_data.class.properties.each do |attr_name|
-              merged_metadata[attr_name] = ctx_data.send(attr_name)
-            end
-          
+      # clearing a small hash is slightly faster than creating a new
+      # one each time.
+      merged_metadata.clear
+    
+      # first load context data
+      context.each do |ctx_data|
+        case ctx_data
+        when Hash
+          merged_metadata.merge!(ctx_data)
+        
+        when Extension
+          ctx_data.class.properties.each do |attr_name|
+            merged_metadata[attr_name] = ctx_data.send(attr_name)
           end
-        end
-      
-        # then add our data
-        merged_metadata.merge!(metadata)
         
-        # and dispatch the result
-        dispatch(msg, merged_metadata)
+        end
       end
+    
+      # then add our data
+      merged_metadata.merge!(metadata)
+      
+      # and dispatch the result
+      dispatch(msg, merged_metadata)
     end
     
     # Helper methods to mimic the standard ruby logger interface.
     %w(debug info error warn).each do |level|
-      define_method(level) do |msg, metadata = {}|
-        log(msg, metadata.merge(:severity => level.to_sym))
-      end
+      class_eval %{
+        def #{level}(msg, metadata = {})
+          # metadata << [:severity, :#{level}]
+          metadata[:severity] = :#{level}
+          log(msg, metadata)
+        end
+      }
     end
     
     ##

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

@@ -0,0 +1,48 @@
+gem 'eventmachine';     require 'eventmachine'
+gem 'em-http-request';  require 'em-http-request'
+gem 'yajl-ruby';        require 'yajl'
+
+# 
+module DLogger
+  module Output
+    
+    class SplunkStorm < Base
+      API_VERSION = 1
+      ENDPOINT = 'inputs/http'
+      
+      def initialize(url, opts = {})
+        @url = "#{url}/#{API_VERSION}/#{ENDPOINT}"
+        
+        @access_token = opts.delete(:access_token)
+        
+        @event_params = {
+            :sourcetype => 'json_auto_timestamp',
+            :host       => opts.delete(:host),
+            :project    => opts.delete(:project)
+          }
+        
+        raise ":access_token required" unless @access_token
+        raise ":host required" unless @event_params[:host]
+        raise ":project required" unless @event_params[:project]
+        
+        raise "unknown options: #{opts.inspect}" unless opts.empty?
+      end
+      
+      def dispatch(msg, metadata)
+        metadata = metadata.merge(:message => msg)
+        http = EM::HttpRequest.new(@url).post(
+            :query  => @event_params,
+            :head   => {'authorization' => [@access_token, 'x']},
+            :body   => Yajl::Encoder.encode(metadata)
+          )
+
+        # http.errback do
+        #   p "ERR: #{http.response_header}"
+        # end
+        
+      end
+      
+    end
+    
+  end
+end

data/lib/dlogger/version.rb

@@ -1,3 +1,3 @@
 module Dlogger
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/specs/common.rb

@@ -2,51 +2,36 @@
 require 'rubygems'
 require 'bundler/setup'
 
-if (RUBY_VERSION >= "1.9") && ENV['COVERAGE']
-  require 'simplecov'
-  
-  puts "[[  SimpleCov enabled  ]]"
+require 'bacon'
+
+if ENV['COVERAGE']
+  Bacon.allow_focused_run = false
   
-  SimpleCov.start do    
-    add_filter '/specs'
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter ".*_spec"
+    add_filter "/helpers/"
   end
+  
 end
 
-require 'bacon'
-require 'mocha'
-
-$LOAD_PATH.unshift( File.expand_path('../../lib', __FILE__) )
+$LOAD_PATH.unshift( File.expand_path('../../lib' , __FILE__) )
 require 'dlogger'
 
+require 'bacon/ext/mocha'
+require 'bacon/ext/em'
+require 'bacon/ext/http'
+# require 'time_units'
+# Thread.abort_on_exception = true
 
-Bacon.summary_at_exit
+Bacon.summary_on_exit()
 
-module Bacon
-  module MochaRequirementsCounter
-    def self.increment
-      Counter[:requirements] += 1
-    end
-  end
-  
-  class Context
-    include Mocha::API
-    
-    alias_method :it_before_mocha, :it
-    
-    def it(description)
-      it_before_mocha(description) do
-        # TODO: find better than that...
-        1.should == 1
-        begin
-          mocha_setup
-          yield
-          mocha_verify(MochaRequirementsCounter)
-        rescue Mocha::ExpectationError => e
-          raise Error.new(:failed, "#{e.message}\n#{e.backtrace[0...10].join("\n")}")
-        ensure
-          mocha_teardown
-        end
-      end
-    end
+
+def freeze_time(t = Time.now)
+  Time.stubs(:now).returns(t)
+  if block_given?
+    yield
+    Time.unstub(:now)
   end
 end
+

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

@@ -0,0 +1,34 @@
+require_relative "../../../common"
+
+require 'dlogger/outputs/em/logstash'
+
+$n = 0
+
+describe "LogStash 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)
+    
+    @logger = DLogger::Output::LogStash.new('127.0.0.1', @port)
+  end
+  
+  should 'send message to logstash' do
+    @logger.dispatch('a log message', {:data => "something", :n => 21})
+    
+    wait(0.1) do
+      @received_data.should == "{\"data\":\"something\",\"n\":21,\"message\":\"a log message\"}\n"
+    end
+  end
+  
+end

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

@@ -0,0 +1,43 @@
+require_relative "../../../common"
+
+require 'dlogger/outputs/em/splunkstorm'
+
+$n = 0
+
+describe "SplunkStorm Output" do
+  before do
+    @http_port = 4000 + ($n += 1)
+    
+    @request_uri = ""
+    @received_data = ""
+    
+    received_data = @received_data
+    request_uri = @request_uri
+    
+    start_server do |rack|
+      run ->(env){
+        request_uri << env['REQUEST_URI']
+        received_data << env['rack.input'].read()
+        [200, {}, []]
+      }
+    end
+    
+    
+    # 1/inputs/http
+    @logger = DLogger::Output::SplunkStorm.new("http://127.0.0.1:#{@http_port}",
+        :host         => 'test.com',
+        :access_token => "TOKEN",
+        :project      => "PR"
+      )
+  end
+  
+  should 'send message to logstash' do
+    @logger.dispatch('a log message', {:data => "something", :n => 21})
+    
+    wait(0.1) do
+      @request_uri.should == "/1/inputs/http?sourcetype=json_auto_timestamp&host=test.com&project=PR"
+      @received_data.should == "{\"data\":\"something\",\"n\":21,\"message\":\"a log message\"}"
+    end
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dlogger
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,41 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-29 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70168315282880 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70168315282880
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: &70168315298480 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70168315298480
-- !ruby/object:Gem::Dependency
-  name: guard-tilt
-  requirement: &70168315297920 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70168315297920
+date: 2012-06-25 00:00:00.000000000 Z
+dependencies: []
 description: Advanced logger allowing you to include metadata with your messages
 email:
 - schmurfy@gmail.com
@@ -52,6 +19,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- ChangeLog
 - Gemfile
 - Guardfile
 - LICENSE
@@ -64,18 +32,22 @@ files:
 - examples/hash_context.rb
 - examples/logstash.rb
 - examples/nested_context.rb
+- examples/splunk.rb
 - examples/threads.rb
 - lib/dlogger.rb
 - lib/dlogger/extension.rb
 - lib/dlogger/logger.rb
 - lib/dlogger/outputs/base.rb
 - lib/dlogger/outputs/em/logstash.rb
+- lib/dlogger/outputs/em/splunkstorm.rb
 - lib/dlogger/outputs/stdlib_logger.rb
 - lib/dlogger/outputs/stdout.rb
 - lib/dlogger/version.rb
 - specs/common.rb
 - specs/lib/extension_spec.rb
 - specs/lib/logger_spec.rb
+- specs/lib/outputs/em/logstash_spec.rb
+- specs/lib/outputs/em/splunkstorm_spec.rb
 - specs/lib/outputs/stdlib_logger_spec.rb
 - specs/lib/outputs/stdout_spec.rb
 homepage: ''
@@ -92,7 +64,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 738648334169580825
+      hash: -981071182900887075
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -101,10 +73,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 738648334169580825
+      hash: -981071182900887075
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ! 'Dynamic logger: add a context to your log messages'