fluent-plugin-out-http-ext 0.1.5.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18cacab722418c7993224de7d95fb10c4a399cdb
-  data.tar.gz: d0f8ac309fc40824d9778b45f9761ed6490d8e69
+  metadata.gz: 3e9c08d1a809ddd3df73b5ab13fe55ac7ed79305
+  data.tar.gz: 2af17adfcbb3375ab1079dfcc56d51d2a64d0b06
 SHA512:
-  metadata.gz: 59a8e361b6453eed63590dfdb0f1e47d90432681858311f71417779cfdc61c7aede95cd6e58b69619dcf4da82ecb72103fad3291444e05afe7fa4ec7e965c996
-  data.tar.gz: 4efceb4ff4fd906ccddbc36ac504339c3fdf73838a75bdbf2ba28da69b1a0714fc4d2c88d82b9b72f563fa19ee3954789a7df2a90ff2169dd7510ff0abd18da4
+  metadata.gz: 4c445f8eb6d35bf52705eeb683ff48f15d96b5eadc8625736ce98cd2b52d9f207a4e08ba6abd2ac8306b025d0626eae55e3204ab3806638fdd4468c19b7699d4
+  data.tar.gz: 66977734544084539b681b6690e82fef9cb595badfb57cd509f97f1cdf196afd3e314e0697bda3a25175f119bdb78b278237ee8ee1c7d2e3e515bb50d99f7bb6

data/.coveralls.yml

@@ -0,0 +1,2 @@
+service_name: travis-pro
+repo_token: 9tG18WMwC1xpPdDBEGznon01RCp9NusHL

data/.gitignore

@@ -6,3 +6,4 @@
 .ruby-version
 Gemfile.lock
 vendor
+coverage/

data/.travis.yml

@@ -4,11 +4,9 @@ rvm:
   - 2.1
   - 2.2
   - ruby-head
-  - rbx-2
 
 os:
   - linux
-  - osx
 
 gemfile:
   - Gemfile
@@ -18,4 +16,3 @@ script: bundle exec rake test
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: rbx-2

data/README.md

@@ -1,5 +1,8 @@
 # fluent-plugin-out-http-ext, a plugin for [Fluentd](http://fluentd.org)
 
+[![Build Status](https://travis-ci.org/kawasakitoshiya/fluent-plugin-out-http-ext.svg)](https://travis-ci.org/kawasakitoshiya/fluent-plugin-out-http-ext)
+[![Coverage Status](https://coveralls.io/repos/kawasakitoshiya/fluent-plugin-out-http-ext/badge.svg?branch=master&service=github)](https://coveralls.io/github/kawasakitoshiya/fluent-plugin-out-http-ext?branch=master)
+
 **This is a fork of [ento / fluent-plugin-out-http](https://github.com/ento/fluent-plugin-out-http)**
 
 A generic [fluentd][1] output plugin for sending logs to an HTTP endpoint
@@ -7,16 +10,17 @@ A generic [fluentd][1] output plugin for sending logs to an HTTP endpoint
 ## Configuration options
 
     <match *>
-      type http-ext
-      endpoint_url    http://localhost.local/api/<data.id> # <data.id> refres to data.id in the record like {"data"=> {"id"=> 1, "name"=> "foo"}}
-      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: '', secret: true
-      use_ssl         true   # default: false
+      type http_ext
+      endpoint_url          http://localhost.local/api/<data.id> # <data.id> refres to data.id in the record like {"data"=> {"id"=> 1, "name"=> "foo"}}
+      http_method           put                                  # default: post
+      serializer            json                                 # default: form
+      rate_limit_msec       100                                  # default: 0 = no rate limiting
+      raise_on_error        false                                # default: true
+      raise_on_http_failure true                                 # default: false
+      authentication        basic                                # default: none
+      username              alice                                # default: ''
+      password              bobpop                               # default: '', secret: true
+      use_ssl               true                                 # default: false
       <headers>
         HeaderExample1 header1
         HeaderExample2 header2

data/fluent-plugin-out-http-ext.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-out-http-ext"
-  gem.version       = "0.1.5.4"
+  gem.version       = "0.1.6"
   gem.authors       = ["Toshiya Kawasaki"]
   gem.email         = ["kawasakitoshiya@gmail.com"]
   gem.summary       = %q{A generic Fluentd output plugin to send logs to an HTTP endpoint with SSL and Header option}
@@ -19,4 +19,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "test-unit", ">= 3.1.0"
+  gem.add_development_dependency "coveralls"
 end

data/lib/fluent/plugin/out_http_ext.rb

@@ -48,9 +48,12 @@ class Fluent::HTTPOutput < Fluent::Output
   # Raise errors that were rescued during HTTP requests?
   config_param :raise_on_error, :bool, :default => true
 
+  # Raise errors when HTTP response code was not successful.
+  config_param :raise_on_http_failure, :bool, :default => false
+
 
   # nil | 'none' | 'basic'
-  config_param :authentication, :string, :default => nil 
+  config_param :authentication, :string, :default => nil
   config_param :username, :string, :default => ''
   config_param :password, :string, :default => '', :secret => true
 
@@ -167,7 +170,9 @@ class Fluent::HTTPOutput < Fluent::Output
                         else
                            "res=nil"
                         end
-          $log.warn "failed to #{req.method} #{uri} (#{res_summary})"
+          warning = "failed to #{req.method} #{uri} (#{res_summary})"
+          $log.warn warning
+          raise warning if @raise_on_http_failure
        end #end unless
     end # end begin
   end # end send_request

data/test/plugin/test_helper.rb

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+require 'coveralls'
+Coveralls.wear!

data/test/plugin/test_out_http_ext.rb

@@ -17,6 +17,7 @@ class HTTPOutputTestBase < Test::Unit::TestCase
     @prohibited = 0
     @requests = 0
     @auth = false
+    @status = 200
     @dummy_server_thread = Thread.new do
       srv = if ENV['VERBOSE']
               WEBrick::HTTPServer.new({:BindAddress => '127.0.0.1', :Port => TEST_LISTEN_PORT})
@@ -52,7 +53,7 @@ class HTTPOutputTestBase < Test::Unit::TestCase
 
           instance_variable_get("@#{req.request_method.downcase}s").push(record)
 
-          res.status = 200
+          res.status = @status
         }
         srv.mount_proc('/') { |req,res|
           res.status = 200
@@ -81,11 +82,11 @@ class HTTPOutputTestBase < Test::Unit::TestCase
         end
       end
       cv.signal
-    } 
+    }
     mutex = Mutex.new
     mutex.synchronize {
       cv.wait(mutex)
-    } 
+    }
   end
 
   def test_dummy_server
@@ -156,6 +157,11 @@ class HTTPOutputTest < HTTPOutputTestBase
     raise_on_error false
   ]
 
+  CONFIG_RAISE_ON_HTTP_FAILURE = %[
+    endpoint_url http://127.0.0.1:#{TEST_LISTEN_PORT}/api/
+    raise_on_http_failure true
+  ]
+
   RATE_LIMIT_MSEC = 1200
 
   CONFIG_RATE_LIMIT = %[
@@ -189,7 +195,6 @@ class HTTPOutputTest < HTTPOutputTestBase
     assert_equal '20', record[:form]['field2']
     assert_equal '10', record[:form]['field3']
     assert_equal '1', record[:form]['otherfield']
-    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 })
@@ -251,6 +256,28 @@ class HTTPOutputTest < HTTPOutputTestBase
     assert_equal 0, @requests
   end
 
+  def test_http_failure_is_not_raised_on_http_failure_true_and_status_201
+    @status = 201
+
+    d = create_driver CONFIG_RAISE_ON_HTTP_FAILURE
+    assert_nothing_raised do
+      d.emit({ 'field1' => 50 })
+    end
+
+    @status = 200
+  end
+
+  def test_http_failure_is_raised_on_http_failure_true
+    @status = 500
+
+    d = create_driver CONFIG_RAISE_ON_HTTP_FAILURE
+    assert_raise RuntimeError do
+      d.emit({ 'field1' => 50 })
+    end
+
+    @status = 200
+  end
+
   def test_rate_limiting
     d = create_driver CONFIG_RATE_LIMIT
     record = { :k => 1 }
@@ -268,7 +295,7 @@ class HTTPOutputTest < HTTPOutputTestBase
 
     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)
     d.run
@@ -278,7 +305,7 @@ class HTTPOutputTest < HTTPOutputTestBase
   def _current_msec
     Time.now.to_f * 1000
   end
-  
+
   def test_auth
     @auth = true # enable authentication of dummy server
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-out-http-ext
 version: !ruby/object:Gem::Version
-  version: 0.1.5.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Toshiya Kawasaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -86,6 +86,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A generic Fluentd output plugin to send logs to an HTTP endpoint with
   SSL and Header option
 email:
@@ -94,6 +108,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
@@ -104,6 +119,7 @@ files:
 - fluent-plugin-out-http-ext.gemspec
 - lib/fluent/plugin/out_http_ext.rb
 - lib/fluent/test/http_output_test.rb
+- test/plugin/test_helper.rb
 - test/plugin/test_out_http_ext.rb
 homepage: 
 licenses:
@@ -131,4 +147,5 @@ specification_version: 4
 summary: A generic Fluentd output plugin to send logs to an HTTP endpoint with SSL
   and Header option
 test_files:
+- test/plugin/test_helper.rb
 - test/plugin/test_out_http_ext.rb