fluent-plugin-out-http 0.1.2 → 0.1.3

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.1.3
+* Add configuration option: raise_on_error (default: true)
+  * To have the plugin raise exceptions like it did in 0.1.1: keep using your configuration as-is
+  * To supress all exceptions: add `raise_on_error false` to your configuration
+
 ## 0.1.2
 * #6 Catch all `StandardError`s during HTTP request to prevent td-agent from freezing
 

data/README.md

@@ -4,22 +4,28 @@ 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
+## Configuration options
 
     <match *>
       type http
       endpoint_url    http://localhost.local/api/
-      http_method     put
-      serializer      json
-      rate_limit_msec 100
-      authentication  basic
-      username        alice
-      password        bobpop
+      http_method     put    # default: post
+      serializer      json   # default: form
+      rate_limit_msec 100    # default: 0 = no rate limiting
+      raise_on_error  false  # default: true
+      authentication  basic  # default: none
+      username        alice  # default: ''
+      password        bobpop # default: ''
     </match>
 
+## Usage notes
+
+If you'd like to retry failed requests, consider using [fluent-plugin-bufferize][3].
+
 ----
 
 Heavily based on [fluent-plugin-growthforecast][2]
 
   [1]: http://fluentd.org/
   [2]: https://github.com/tagomoris/fluent-plugin-growthforecast
+  [3]: https://github.com/sabottenda/fluent-plugin-bufferize

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.2"
+  gem.version       = "0.1.3"
   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

@@ -21,6 +21,9 @@ class Fluent::HTTPOutput < Fluent::Output
   # since the last one.
   config_param :rate_limit_msec, :integer, :default => 0
 
+  # Raise errors that were rescued during HTTP requests?
+  config_param :raise_on_error, :bool, :default => true
+
   # nil | 'none' | 'basic'
   config_param :authentication, :string, :default => nil 
   config_param :username, :string, :default => ''
@@ -104,9 +107,10 @@ class Fluent::HTTPOutput < Fluent::Output
       end
       @last_request_time = Time.now.to_f
       res = Net::HTTP.new(uri.host, uri.port).start {|http| http.request(req) }
-    rescue # rescue all StandardErrors
+    rescue => e # rescue all StandardErrors
       # server didn't respond
-      $log.warn "Net::HTTP.#{req.method.capitalize} raises exception: #{$!.class}, '#{$!.message}'"
+      $log.warn "Net::HTTP.#{req.method.capitalize} raises exception: #{e.class}, '#{e.message}'"
+      raise e if @raise_on_error
     else
        unless res and res.is_a?(Net::HTTPSuccess)
           res_summary = if res

data/test/plugin/test_out_http.rb

@@ -151,6 +151,11 @@ class HTTPOutputTest < HTTPOutputTestBase
     endpoint_url https://127.0.0.1:#{TEST_LISTEN_PORT + 1}/api/
   ]
 
+  CONFIG_HTTP_ERROR_SUPPRESSED = %[
+    endpoint_url https://127.0.0.1:#{TEST_LISTEN_PORT + 1}/api/
+    raise_on_error false
+  ]
+
   RATE_LIMIT_MSEC = 1200
 
   CONFIG_RATE_LIMIT = %[
@@ -229,8 +234,15 @@ class HTTPOutputTest < HTTPOutputTestBase
     assert_nil record[:auth]
   end
 
-  def test_http_error
+  def test_http_error_is_raised
     d = create_driver CONFIG_HTTP_ERROR
+    assert_raise Errno::ECONNREFUSED do
+      d.emit({ 'field1' => 50 })
+    end
+  end
+
+  def test_http_error_is_suppressed_with_raise_on_error_false
+    d = create_driver CONFIG_HTTP_ERROR_SUPPRESSED
     d.emit({ 'field1' => 50 })
     d.run
     # drive asserts the next output chain is called;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-out-http
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -107,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3802053956636342653
+      hash: -1675313951779573112
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3802053956636342653
+      hash: -1675313951779573112
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23