fluent-plugin-http 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 06eb1f3844b3acb3defcd95799816b80407ec3fc
-  data.tar.gz: 560e89a57bb879563d10106738e26ebdc3a33679
+SHA256:
+  metadata.gz: d88d022ba37439ff21cff59e0bd324c078b4626b24e9850d0b8b5f3200f54846
+  data.tar.gz: ac659d21eee4da63c7082cc67f1a2f7141075bd6f35f7c6cedb098fc3cf8e189
 SHA512:
-  metadata.gz: ec9675ab52b62d921e94d8c2a10bf2c9b14b8808cb606d648d23c64678b22471b243d9275165d562c22cb63ab883b37008395f31af048e507a41e57aeb4fbd3e
-  data.tar.gz: 0ed6223fcd2c1afb7adfa16c7d9a8d8277e9dc8ee4e7eb2fee6ad97be7bab75e33bde5c297a56ca56a44aa3bc905a3632b89ad7e4801fe225ffd38b940a29815
+  metadata.gz: d6882a0898632b3422fe58817c035e32428273ea8043783c1d693f2bc758cc8ff224728a909d2980f6e2eee2c78d75777bd8c417d4f8384736ea3c5378d5806f
+  data.tar.gz: 2c04dfbae65ce4253dbff47863a82fd4de4c9e1f87adab79c1fc85eef68d9c1bd60886fba48589259169d3d73cbfa700a1397ec9747e64775b069337291d3a0b

data/lib/fluent/plugin/out_http.rb

@@ -20,6 +20,9 @@ module Fluent
     desc 'Authorization token'
     config_param :authorization_token, :string, default: nil, secret: true
 
+    desc 'Keep-alive timeout'
+    config_param :keep_alive_timeout, :float, default: 60.0
+
     def initialize
       require 'fluent/plugin/http/error'
 
@@ -36,16 +39,7 @@ module Fluent
       @url = validate_url(url)
       @accept_status_code = validate_accept_status_code(accept_status_code)
       @authorization_token = validate_authorization_token(authorization_token)
-    end
-
-    # Hook method that is called at the startup
-    #
-    # @return void
-    def start
-      super
-
-      is_https = url.scheme == 'https'
-      @http = Net::HTTP.start(url.host, url.port, use_ssl: is_https)
+      @keep_alive_timeout = validate_keep_alive_timeout(keep_alive_timeout)
     end
 
     # Hook method that is called at the shutdown
@@ -54,7 +48,7 @@ module Fluent
     def shutdown
       super
 
-      http.finish
+      disconnect
     end
 
     # Serializes the event
@@ -73,6 +67,8 @@ module Fluent
     #   formatted events
     # @return void
     def write(chunk)
+      return if chunk.empty?
+
       records = []
 
       chunk.msgpack_each do |tag_time_record|
@@ -80,7 +76,7 @@ module Fluent
       end
 
       post_records = post_records_request(records)
-      response = http.request(post_records)
+      response = connect.request(post_records)
 
       return if accept_status_code.include?(response.code)
       raise ResponseError.error(post_records, response)
@@ -88,12 +84,30 @@ module Fluent
 
     private
 
-    attr_reader :http
+    JSON_MIME_TYPE = 'application/json'.freeze
+    private_constant :JSON_MIME_TYPE
 
-    JSON_MIME_TYPE = 'application/json'
-    USER_AGENT = 'FluentPluginHTTP'
+    USER_AGENT = 'FluentPluginHTTP'.freeze
+    private_constant :USER_AGENT
 
-    private_constant :USER_AGENT, :JSON_MIME_TYPE
+    HTTPS_SCHEME = 'https'.freeze
+    private_constant :HTTPS_SCHEME
+
+    def connect
+      @http ||= Net::HTTP.start(
+        url.host,
+        url.port,
+        use_ssl: url.scheme == HTTPS_SCHEME,
+        keep_alive_timeout: keep_alive_timeout
+      )
+    end
+
+    def disconnect
+      return unless defined?(@http)
+      return unless @http
+
+      @http.finish
+    end
 
     def post_records_request(records)
       Net::HTTP::Post.new(url).tap do |request|
@@ -139,5 +153,11 @@ module Fluent
 
       raise Fluent::ConfigError, "Invalid authorization token: #{value.inspect}"
     end
+
+    def validate_keep_alive_timeout(value)
+      return value if value >= 0
+
+      raise Fluent::ConfigError, "Invalid keep-alive timeout: #{value.inspect}"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-http
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Konstantin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -28,16 +28,16 @@ dependencies:
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,75 +53,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '11.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '11.3'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0.51'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0.51'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.45'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.45'
+        version: '2.1'
 description: 
 email: 
 executables: []
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.1
 signing_key: 
 specification_version: 4
 summary: Fluentd output plugin that sends event records via HTTP