fluent-plugin-http 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ff8a75bb999e8eb4e1880f79bad4d04313c9627
-  data.tar.gz: 4853f237fd8ea659fbf11bc4c7f5eba9950d86cc
+  metadata.gz: e6be21a1fe25c537139150f938f6dfdbef1fb7f5
+  data.tar.gz: 3b45cfa458337d855d26b09d0314f0458364d453
 SHA512:
-  metadata.gz: 1dd4afae7e9c857b78290fc4bc348bb05515d27334ec2ed30a03f12cb43d19272e9e7b5bb9b3a91c6b304240b670798eb20b92dbfe65b0594bd0a07a914d2e35
-  data.tar.gz: 586c01adbcff6879b71345a6a8888e70398afabb176a273e3f4afb13c71db1d50a408c5cfcee2cbbf90a49bdab30fdfcc8436b4b2bcaa58fcfe00e634df7e2ff
+  metadata.gz: cabba8b61a03f4750e180bd8c1acfb85af5fc6335e2229cc51ef6139c16b73aee531e0985e0aaa332b310ccf82478a7321e0b6eba7ca6e3c5ffab9a9b73f68dc
+  data.tar.gz: 0d262e0ae06054e832797f3bbeab5a6f109f23c41b8ab03d0ad12cd2459457d8290d18c36296ccbd6d5d9c1dc406cb07b23fed9d9a770a02e8ac5f48148c42e1

data/lib/fluent/plugin/out_http.rb

@@ -12,6 +12,9 @@ module Fluent
     desc 'The URL to send event records to'
     config_param :url, :string
 
+    desc 'The acceptable response status code'
+    config_param :accept_status_code, :array, default: ['200']
+
     def initialize
       require 'fluent/plugin/http/error'
 
@@ -25,14 +28,8 @@ module Fluent
     def configure(conf)
       super
 
-      @url = URI(conf.fetch('url'))
-
-      unless @url.scheme == 'http' || @url.scheme == 'https'
-        raise Fluent::ConfigError,
-              "Unacceptable URL scheme, expected HTTP or HTTPs: #{@url}"
-      end
-    rescue URI::InvalidURIError => invalid_uri_error
-      raise Fluent::ConfigError, invalid_uri_error
+      @url = validate_url(url)
+      @accept_status_code = validate_accept_status_code(accept_status_code)
     end
 
     # Hook method that is called at the startup
@@ -64,8 +61,8 @@ module Fluent
       [tag, time, record].to_msgpack
     end
 
-    SUCCESSFUL_RESPONSE_CODE_PREFIX = '2'
-    private_constant :SUCCESSFUL_RESPONSE_CODE_PREFIX
+    USER_AGENT = 'FluentPluginHTTP'
+    private_constant :USER_AGENT
 
     # Sends the event records
     #
@@ -76,10 +73,11 @@ module Fluent
       chunk.msgpack_each do |_tag, _time, record|
         post_record = Net::HTTP::Post.new(url)
         post_record.set_form_data(record)
+        post_record['User-Agent'] = USER_AGENT
 
         response = http.request(post_record)
 
-        unless response.code.start_with?(SUCCESSFUL_RESPONSE_CODE_PREFIX)
+        unless accept_status_code.include?(response.code)
           raise ResponseError.error(post_record, response)
         end
       end
@@ -88,5 +86,30 @@ module Fluent
     private
 
     attr_reader :http
+
+    def validate_url(test_url)
+      url = URI(test_url)
+      return url if url.scheme == 'http' || url.scheme == 'https'
+
+      raise Fluent::ConfigError,
+            "Unacceptable URL scheme, expected HTTP or HTTPs: #{test_url}"
+    rescue URI::InvalidURIError => invalid_uri_error
+      raise Fluent::ConfigError, invalid_uri_error
+    end
+
+    def validate_accept_status_code(status_codes)
+      if !status_codes.empty? && status_codes.all?(&method(:http_status_code?))
+        return status_codes
+      end
+
+      raise Fluent::ConfigError, "Invalid status codes: #{status_codes.inspect}"
+    end
+
+    HTTP_STATUS_CODE_RANGE = (100...600).freeze
+    private_constant :HTTP_STATUS_CODE_RANGE
+
+    def http_status_code?(code)
+      HTTP_STATUS_CODE_RANGE.cover?(code.to_i)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-http
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Konstantin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-06 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd