fluent-plugin-out-http 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# Changelog
+
+## 0.1.1
+* #2 Use yajl instead of json as json serializer
+* #1 Fix a bug where a nil HTTP response caused the plugin to stop working
+
+## 0.1.0
+* Initial release

data/fluent-plugin-out-http.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-out-http"
-  gem.version       = "0.1.0"
+  gem.version       = "0.1.1"
   gem.authors       = ["Marica Odagaki"]
   gem.email         = ["ento.entotto@gmail.com"]
   gem.summary       = %q{A generic Fluentd output plugin to send logs to an HTTP endpoint}
@@ -14,8 +14,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.add_runtime_dependency "yajl-ruby", "~> 1.0"
+  gem.add_runtime_dependency "fluentd", "~> 0.10.0"
   gem.add_development_dependency "bundler"
-  gem.add_development_dependency "json"
-  gem.add_development_dependency "fluentd"
-  gem.add_runtime_dependency "fluentd"
+  gem.add_development_dependency "rake"
 end

data/lib/fluent/plugin/out_http.rb

@@ -1,5 +1,3 @@
-require 'json'
-
 class Fluent::HTTPOutput < Fluent::Output
   Fluent::Plugin.register_output('http', self)
 
@@ -7,6 +5,7 @@ class Fluent::HTTPOutput < Fluent::Output
     super
     require 'net/http'
     require 'uri'
+    require 'yajl'
   end
 
   # Endpoint URL ex. localhost.local/api/
@@ -77,7 +76,7 @@ class Fluent::HTTPOutput < Fluent::Output
   end
 
   def set_json_body(req, data)
-    req.body = JSON.dump(data)
+    req.body = Yajl.dump(data)
     req['Content-Type'] = 'application/json'
   end
 
@@ -109,7 +108,12 @@ class Fluent::HTTPOutput < Fluent::Output
       $log.warn "Net::HTTP.#{req.method.capitalize} raises exception: #{$!.class}, '#{$!.message}'"
     end
     unless res and res.is_a?(Net::HTTPSuccess)
-      $log.warn "failed to #{req.method} #{uri} (#{res.code} #{res.message} #{res.body})"
+      res_summary = if res
+                      "#{res.code} #{res.message} #{res.body}"
+                    else
+                      "res=nil"
+                    end
+      $log.warn "failed to #{req.method} #{uri} (#{res_summary})"
     end
   end
 

data/test/plugin/test_out_http.rb

@@ -1,4 +1,6 @@
-require 'json'
+# -*- coding: utf-8 -*-
+require 'uri'
+require 'yajl'
 require 'fluent/test/http_output_test'
 require 'fluent/plugin/out_http'
 
@@ -13,6 +15,7 @@ class HTTPOutputTestBase < Test::Unit::TestCase
     @posts = []
     @puts = []
     @prohibited = 0
+    @requests = 0
     @auth = false
     @dummy_server_thread = Thread.new do
       srv = if ENV['VERBOSE']
@@ -24,6 +27,7 @@ class HTTPOutputTestBase < Test::Unit::TestCase
       begin
         allowed_methods = %w(POST PUT)
         srv.mount_proc('/api/') { |req,res|
+          @requests += 1
           unless allowed_methods.include? req.request_method
             res.status = 405
             res.body = 'request method mismatch'
@@ -41,7 +45,7 @@ class HTTPOutputTestBase < Test::Unit::TestCase
 
           record = {:auth => nil}
           if req.content_type == 'application/json'
-            record[:json] = JSON.parse(req.body)
+            record[:json] = Yajl.load(req.body)
           else
             record[:form] = Hash[*(req.body.split('&').map{|kv|kv.split('=')}.flatten)]
           end
@@ -143,6 +147,10 @@ class HTTPOutputTest < HTTPOutputTestBase
     http_method put
   ]
 
+  CONFIG_HTTP_ERROR = %[
+    endpoint_url https://127.0.0.1:#{TEST_LISTEN_PORT + 1}/api/
+  ]
+
   RATE_LIMIT_MSEC = 1200
 
   CONFIG_RATE_LIMIT = %[
@@ -166,7 +174,7 @@ class HTTPOutputTest < HTTPOutputTestBase
 
   def test_emit_form
     d = create_driver
-    d.emit({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
+    d.emit({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1, 'binary' => "\xe3\x81\x82".force_encoding("ascii-8bit") })
     d.run
 
     assert_equal 1, @posts.size
@@ -176,6 +184,7 @@ class HTTPOutputTest < HTTPOutputTestBase
     assert_equal '20', record[:form]['field2']
     assert_equal '10', record[:form]['field3']
     assert_equal '1', record[:form]['otherfield']
+    assert_equal URI.escape("あ"), record[:form]['binary']
     assert_nil record[:auth]
 
     d.emit({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
@@ -204,8 +213,9 @@ class HTTPOutputTest < HTTPOutputTestBase
   end
 
   def test_emit_json
+    binary_string = "\xe3\x81\x82".force_encoding("ascii-8bit")
     d = create_driver CONFIG_JSON
-    d.emit({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
+    d.emit({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1, 'binary' => binary_string })
     d.run
 
     assert_equal 1, @posts.size
@@ -215,9 +225,20 @@ class HTTPOutputTest < HTTPOutputTestBase
     assert_equal 20, record[:json]['field2']
     assert_equal 10, record[:json]['field3']
     assert_equal 1, record[:json]['otherfield']
+    assert_equal binary_string, record[:json]['binary']
     assert_nil record[:auth]
   end
 
+  def test_http_error
+    d = create_driver CONFIG_HTTP_ERROR
+    d.emit({ 'field1' => 50 })
+    d.run
+    # drive asserts the next output chain is called;
+    # so no exception means our plugin handled the error
+
+    assert_equal 0, @requests
+  end
+
   def test_rate_limiting
     d = create_driver CONFIG_RATE_LIMIT
     record = { :k => 1 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-out-http
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 +09:00
-default_executable: 
+date: 2013-12-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: fluentd
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70205234747520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,21 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70205234747520
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: &70205234747080 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70205234747080
 - !ruby/object:Gem::Dependency
-  name: fluentd
-  requirement: &70205234746660 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,18 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70205234746660
-- !ruby/object:Gem::Dependency
-  name: fluentd
-  requirement: &70205234746240 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70205234746240
 description: A generic Fluentd output plugin to send logs to an HTTP endpoint
 email:
 - ento.entotto@gmail.com
@@ -64,6 +83,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -72,7 +92,6 @@ files:
 - lib/fluent/plugin/out_http.rb
 - lib/fluent/test/http_output_test.rb
 - test/plugin/test_out_http.rb
-has_rdoc: true
 homepage: https://github.com/ento/fluent-plugin-out-http
 licenses: []
 post_install_message: 
@@ -85,15 +104,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4460454963525016737
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4460454963525016737
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A generic Fluentd output plugin to send logs to an HTTP endpoint