logstash-mixin-http_client 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc84bd2e6f07407dea886030c9e2aafe670f25e3
-  data.tar.gz: c5cdbb9d5973842be8222e3b718db1965d907e71
+  metadata.gz: 57fb8e8127a85c71e85f61692ec3506ad8ad0c4e
+  data.tar.gz: 98bbb4c5211f5cbcc8b4adfe21e1ccf5e26cf85d
 SHA512:
-  metadata.gz: adff2b1cb9c1e2f686d18faf5e756fdfb8a78f36901f8bc4832993b058cd687f4616d5ec6385e3abbbb576e99b3969576272424af9fb3bb74ac93e2a9fc10653
-  data.tar.gz: c09d2bf09f038e1e6e4e77acd0dd4a76a28be684957de0fbef0a25787b7abc901b43807502bf24d6b1d31d96e24e15763abb4531142c683c9cfac79ed4f5b0ac
+  metadata.gz: b3c1a7b5cd816f0080a5e3233b9f7f4b7bbd3341f5ab85b6774201ba0248542c98fe11b10c34276772a377cf84c1b43ed2803a95420ca07b83a016ce7403b977
+  data.tar.gz: 171cef74131ad528f723752484368db9ce91ccd6b1ba76c99fb5003c65bf58bbc09324367f5b1069f5ba1147de151be40c11f523d755e852336f8d2226f2d8dd

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+# 2.2.1
+ * Use a superior 'validate_after_inactivity' default of 200ms to force more frequent checks for broken keepalive situations
 # 2.2.0
  * Bump manticore version to be at least 0.5.2 for #close support
 # 2.1.0

data/lib/logstash/plugin_mixins/http_client.rb

@@ -45,6 +45,13 @@ module LogStash::PluginMixins::HttpClient
     # If `automatic_retries` is enabled this will cause non-idempotent HTTP verbs (such as POST) to be retried.
     config :retry_non_idempotent, :validate => :boolean, :default => false
 
+    # How long to wait before checking if the connection is stale before executing a request on a connection using keepalive.
+    # # You may want to set this lower, possibly to 0 if you get connection errors regularly
+    # Quoting the Apache commons docs (this client is based Apache Commmons):
+    # 'Defines period of inactivity in milliseconds after which persistent connections must be re-validated prior to being leased to the consumer. Non-positive value passed to this method disables connection validation. This check helps detect connections that have become stale (half-closed) while kept inactive in the pool.'
+    # See https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.html#setValidateAfterInactivity(int)[these docs for more info]
+    config :validate_after_inactivity, :validate => :number, :default => 200
+
     # Set this to false to disable SSL/TLS certificate validation
     # Note: setting this to false is generally considered insecure!
     config :ssl_certificate_validation, :validate => :boolean, :default => true
@@ -98,6 +105,7 @@ module LogStash::PluginMixins::HttpClient
       follow_redirects: @follow_redirects,
       automatic_retries: @automatic_retries,
       retry_non_idempotent: @retry_non_idempotent,
+      check_connection_timeout: @validate_after_inactivity,
       pool_max: @pool_max,
       pool_max_per_route: @pool_max_per_route,
       cookies: @cookies,

data/logstash-mixin-http_client.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-mixin-http_client'
-  s.version         = '2.2.0'
+  s.version         = '2.2.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "AWS mixins to provide a unified interface for Amazon Webservice"
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", ">= 2.0.0.beta2", "< 3.0.0"
+  s.add_runtime_dependency "logstash-core", ">= 2.0.0", "< 3.0.0"
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'manticore', '>= 0.5.2', '< 1.0.0'
 

data/spec/plugin_mixin/http_client_spec.rb

@@ -37,7 +37,7 @@ describe LogStash::PluginMixins::HttpClient do
     end
 
     if type == :jks
-      let(:store_password) { conf["#{key}_password"].value}
+      let(:store_password) { conf["#{key}_password"] }
       let(:store_type) { conf["#{key}_type"]}
 
       it "should set the bundle password" do
@@ -74,6 +74,17 @@ describe LogStash::PluginMixins::HttpClient do
     end
   end
 
+  describe "with a custom validate_after_activity" do
+    subject { Dummy.new(client_config).send(:client_config) }
+
+    let(:check_timeout) { 20 }
+    let(:client_config) { basic_config.merge("validate_after_inactivity" => check_timeout )}
+
+    it "should properly set the correct manticore option" do
+      expect(subject[:check_connection_timeout]).to eql(check_timeout)
+    end
+  end
+
   describe "with a custom keystore" do
     let(:file) { Stud::Temporary.file }
     let(:path) { file.path }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-mixin-http_client
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -24,7 +24,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0