logstash-input-http_poller 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 376d01f7f7f2543cf29dc25d017d09e5d7c46472
-  data.tar.gz: e1fe840d963dc87fb97afd647f43047eaf9f1a44
+  metadata.gz: 0a79de169452abf5395cb7a3e06a5dae63f27dda
+  data.tar.gz: 755ee4b2c9fbc325ceac82c093b8b35ab9d30fab
 SHA512:
-  metadata.gz: 9b7aa09232b6540dab84356da874b160396071edcc76ae1e1021e98121909918319cf87624f2fc069bf26980051360ad60455bfb0b83050d37e732d4a28fa7b6
-  data.tar.gz: b151a285605f59e062f62faddf8c4b09378fc43ee0fe2ef51525e6e102c36e3b5c3094eeb65ad66480703ef2274371adbe2b15f9b900d9ee27e7cb0519b0780b
+  metadata.gz: a9aba937e2387dd41d10a50f7e423dc4f79cdfd09314a9e6ab422a1f3063d33bc35166a12a442c9d14f286c6bd77129ed22348567dde55e8db199e1d31b30754
+  data.tar.gz: 78b7e079c117d402e17af33a59c628b85fcc51ca201235ecf362774654ad46cc7f264f38f5de1049c260d17e6f8c2251704f150c9ec5f5aaa2f02b405506a880

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+* 1.1.1
+  - Default to zero connection retries
 * 1.1.0
   - Error metadata no longer '_' prefixed for kibana compat
   - HTTP metadata now normalized to prevent conflicts with ES schemas

data/lib/logstash/inputs/http_poller.rb

@@ -18,6 +18,7 @@ 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"
 #         }
@@ -44,6 +45,11 @@ 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"
@@ -82,10 +88,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]
+      res = [:get, url_or_spec, DEFAULT_SPEC.clone]
     elsif url_or_spec.is_a?(Hash)
       # The client will expect keys / values
-      spec = Hash[url_or_spec.clone.map {|k,v| [k.to_sym, v] }] # symbolize keys
+      spec = Hash[DEFAULT_SPEC.merge(url_or_spec).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.0'
+  s.version         = '1.1.1'
   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."

data/spec/inputs/http_poller_spec.rb

@@ -60,7 +60,9 @@ describe LogStash::Inputs::HTTP_Poller do
 
         it "should to set additional options correctly" do
           opts = normalized.length > 2 ? normalized[2] : nil
-          expect(opts).to eql(spec_opts)
+          # 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)
         end
       end
 
@@ -88,6 +90,29 @@ 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
 
@@ -161,7 +186,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 eql(url)
+          expect(metadata["request"]).to include(url)
         else # Otherwise we have to make some assumptions
           expect(metadata["request"]["url"]).to eql(url)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-http_poller
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - andrewvc
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core