fluent-plugin-out-http 0.1.1 → 0.1.2

data/.gitignore

@@ -3,5 +3,6 @@
 .\#*
 *.gem
 .bundle
+.ruby-version
 Gemfile.lock
 vendor

data/.travis.yml

@@ -0,0 +1,11 @@
+rvm:
+ - 1.9.2
+ - 1.9.3
+ - 2.0.0
+ - 2.1.0
+
+gemfile:
+ - Gemfile
+
+script: bundle exec rake test
+

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.1.2
+* #6 Catch all `StandardError`s during HTTP request to prevent td-agent from freezing
+
 ## 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

data/README.md

@@ -1,7 +1,9 @@
-# fluent-plugin-out-http
+# fluent-plugin-out-http, a plugin for [Fluentd](http://fluentd.org)
 
 A generic [fluentd][1] output plugin for sending logs to an HTTP endpoint.
 
+[![Build Status](https://travis-ci.org/ento/fluent-plugin-out-http.svg?branch=master)](https://travis-ci.org/ento/fluent-plugin-out-http)
+
 ## Configs
 
     <match *>

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.1"
+  gem.version       = "0.1.2"
   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}

data/lib/fluent/plugin/out_http.rb

@@ -97,25 +97,27 @@ class Fluent::HTTPOutput < Fluent::Output
     end
     
     res = nil
+
     begin
       if @auth and @auth == :basic
         req.basic_auth(@username, @password)
       end
       @last_request_time = Time.now.to_f
       res = Net::HTTP.new(uri.host, uri.port).start {|http| http.request(req) }
-    rescue IOError, EOFError, SystemCallError
+    rescue # rescue all StandardErrors
       # server didn't respond
       $log.warn "Net::HTTP.#{req.method.capitalize} raises exception: #{$!.class}, '#{$!.message}'"
-    end
-    unless res and res.is_a?(Net::HTTPSuccess)
-      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
+    else
+       unless res and res.is_a?(Net::HTTPSuccess)
+          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 unless
+    end # end begin
+  end # end send_request
 
   def handle_record(tag, time, record)
     req, uri = create_request(tag, time, record)

data/test/plugin/test_out_http.rb

@@ -184,7 +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_equal URI.encode_www_form_component("あ").upcase, record[:form]['binary'].upcase
     assert_nil record[:auth]
 
     d.emit({ 'field1' => 50, 'field2' => 20, 'field3' => 10, 'otherfield' => 1 })
@@ -254,7 +254,8 @@ class HTTPOutputTest < HTTPOutputTestBase
     assert last_emit + RATE_LIMIT_MSEC > _current_msec, "Still under rate limiting interval"
     assert_equal 1, @posts.size
 
-    sleep (last_emit + RATE_LIMIT_MSEC - _current_msec) * 0.001
+    wait_msec = 500
+    sleep (last_emit + RATE_LIMIT_MSEC - _current_msec + wait_msec) * 0.001
     
     assert last_emit + RATE_LIMIT_MSEC < _current_msec, "No longer under rate limiting interval"
     d.emit(record)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-out-http
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -83,6 +83,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -106,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4460454963525016737
+      hash: 3802053956636342653
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4460454963525016737
+      hash: 3802053956636342653
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23