logstash-input-http_poller 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a79de169452abf5395cb7a3e06a5dae63f27dda
-  data.tar.gz: 755ee4b2c9fbc325ceac82c093b8b35ab9d30fab
+  metadata.gz: 25a9679db9386a407c380a4d321acacf4a40fe84
+  data.tar.gz: 02a990f7c35be4e02feb73d2979cd72e40f999a9
 SHA512:
-  metadata.gz: a9aba937e2387dd41d10a50f7e423dc4f79cdfd09314a9e6ab422a1f3063d33bc35166a12a442c9d14f286c6bd77129ed22348567dde55e8db199e1d31b30754
-  data.tar.gz: 78b7e079c117d402e17af33a59c628b85fcc51ca201235ecf362774654ad46cc7f264f38f5de1049c260d17e6f8c2251704f150c9ec5f5aaa2f02b405506a880
+  metadata.gz: ea3921bd5e960c25b2c4158a421c06240c2f9ac2911e993d6d831cf2a130b41b73083d04e82421b2fe7bb454a90ee9003e72f4c9192d82dbe915e97f23de925e
+  data.tar.gz: 4da38a804b10b3a76b9a455745771421ad9aec1a44a86d418ccbad4779820fe50d3cfbb449b8a7c1fea8547ed5b2c505eb06f5b7937dbcb6cf3b15c8eee0debf

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+* 1.1.2
+  - Correctly default to zero connection retries
+  - Revert old ineffective code for connection retries
 * 1.1.1
   - Default to zero connection retries
 * 1.1.0

data/lib/logstash/inputs/http_poller.rb

@@ -18,7 +18,6 @@ require "manticore"
 #         # Supports all options supported by ruby's Manticore HTTP client
 #         method => get
 #         url => "http://localhost:9200/_cluster/health"
-#         automatic_retries => 2 # Retry the URL twice
 #         headers => {
 #           Accept => "application/json"
 #         }
@@ -45,11 +44,6 @@ require "manticore"
 class LogStash::Inputs::HTTP_Poller < LogStash::Inputs::Base
   include LogStash::PluginMixins::HttpClient
 
-  # Default client options for requests
-  DEFAULT_SPEC = {
-    :automatic_retries => 0 # By default manticore retries 3 times, make this explicit
-  }
-
   config_name "http_poller"
 
   default :codec, "json"
@@ -88,10 +82,10 @@ class LogStash::Inputs::HTTP_Poller < LogStash::Inputs::Base
   private
   def normalize_request(url_or_spec)
     if url_or_spec.is_a?(String)
-      res = [:get, url_or_spec, DEFAULT_SPEC.clone]
+      res = [:get, url_or_spec]
     elsif url_or_spec.is_a?(Hash)
       # The client will expect keys / values
-      spec = Hash[DEFAULT_SPEC.merge(url_or_spec).map {|k,v| [k.to_sym, v] }] # symbolize keys
+      spec = Hash[url_or_spec.clone.map {|k,v| [k.to_sym, v] }] # symbolize keys
 
       # method and url aren't really part of the options, so we pull them out
       method = (spec.delete(:method) || :get).to_sym.downcase

data/logstash-input-http_poller.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-http_poller'
-  s.version         = '1.1.1'
+  s.version         = '1.1.2'
   s.licenses = ['Apache License (2.0)']
   s.summary = "Poll HTTP endpoints with Logstash."
   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."
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "logstash-core", '>= 1.5.0', '< 2.0.0'
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'logstash-codec-json'
-  s.add_runtime_dependency 'logstash-mixin-http_client', ">= 1.0.0"
+  s.add_runtime_dependency 'logstash-mixin-http_client', ">= 1.0.1"
   s.add_runtime_dependency 'stud'
   s.add_runtime_dependency 'manticore'
 

data/spec/inputs/http_poller_spec.rb

@@ -60,9 +60,7 @@ describe LogStash::Inputs::HTTP_Poller do
 
         it "should to set additional options correctly" do
           opts = normalized.length > 2 ? normalized[2] : nil
-          # At this point we'r ddealing in symbols
-          expected = Hash[LogStash::Inputs::HTTP_Poller::DEFAULT_SPEC.merge(spec_opts || {}).map {|k,v| [k.to_sym,v]} ]
-          expect(opts).to eql(expected)
+          expect(opts).to eql(spec_opts)
         end
       end
 
@@ -90,29 +88,6 @@ describe LogStash::Inputs::HTTP_Poller do
             }.merge(Hash[spec_opts.map {|k,v| [k.to_s,v]}])
           end
 
-          it "should include the default options" do
-            expect(normalized[2]).to include(LogStash::Inputs::HTTP_Poller::DEFAULT_SPEC)
-          end
-
-          context "when overiding a spec default" do
-            let(:retries) { 3 }
-            let(:url) do
-              {
-                "url" => spec_url,
-                "method" => spec_method,
-                "automatic_retries" => retries
-              }.merge(Hash[spec_opts.map {|k,v| [k.to_s,v]}])
-            end
-
-            it "should override the default options" do
-              expect(normalized[2]).to include(:automatic_retries => retries)
-            end
-
-            it "should not include the defaults" do
-              expect(normalized[2]).not_to include(LogStash::Inputs::HTTP_Poller::DEFAULT_SPEC)
-            end
-          end
-
           include_examples("a normalized request")
         end
 
@@ -186,7 +161,7 @@ describe LogStash::Inputs::HTTP_Poller do
 
       it "should have the correct request url" do
         if url.is_a?(Hash) # If the url was specified as a complex test the whole thing
-          expect(metadata["request"]).to include(url)
+          expect(metadata["request"]).to eql(url)
         else # Otherwise we have to make some assumptions
           expect(metadata["request"]["url"]).to eql(url)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-http_poller
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - andrewvc
@@ -64,12 +64,12 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency