logstash-input-http_poller 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe8e760b955fa42eefe9e32efb1d22a45a5df599
-  data.tar.gz: 78892043c7636c6ae2390f0a0434049f2c0746a7
+  metadata.gz: a3c874545f73eaab85519980784f809bff6d9d38
+  data.tar.gz: 6d10b710df16a97a37f8296ad813afa6d2a95238
 SHA512:
-  metadata.gz: 981963c7a77ca4ee065efea7dce6cfcef8764e58cca1c168275da196bf9f8255ec34af2ad52fc9051d019faf7820628fb41c37744ee492107f46e9f20f818ae8
-  data.tar.gz: f1db89d4d1a1a44dd750c0348e95b95875844af1a815efb4f9f8bb8e56084d45aa119cd433fb83f0ab775df8e54313783dac51d0997d7c8a6ec1a6f544362fb4
+  metadata.gz: d054bd270a593d98a49ac1b16accf096d45319f612c2bfa60ba4d0ff1cbe21d7b800979e87265d509259343db18a76ce66279b24408225c4cf2b1cb1e4243a33
+  data.tar.gz: ae93340bfbd16af78c59de5da8d5f181ab6bbff077ca31daf6dc2f4144e59df1cfb779ee0c35ec596b50e2a7137ab20bd84d012a188bf7abbe0b5ff82402e7b1

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 3.1.1
+ - Handle empty bodies correctly
 ## 3.1.0
  - Use rufus-scheduler for more flexible scheduling. Many thanks to [@hummingV](https://github.com/hummingV) for this contribution. ([#58](https://github.com/logstash-plugins/logstash-input-http_poller/pull/58))
 

data/lib/logstash/inputs/http_poller.rb

@@ -240,8 +240,16 @@ class LogStash::Inputs::HTTP_Poller < LogStash::Inputs::Base
 
   private
   def handle_success(queue, name, request, response, execution_time)
-    @codec.decode(response.body) do |decoded|
-      event = @target ? LogStash::Event.new(@target => decoded.to_hash) : decoded
+    body = response.body
+    # If there is a usable response. HEAD requests are `nil` and empty get
+    # responses come up as "" which will cause the codec to not yield anything
+    if body && body.size > 0
+      @codec.decode(body) do |decoded|
+        event = @target ? LogStash::Event.new(@target => decoded.to_hash) : decoded
+        handle_decoded_event(queue, name, request, response, event, execution_time)
+      end
+    else
+      event = ::LogStash::Event.new
       handle_decoded_event(queue, name, request, response, event, execution_time)
     end
   end

data/logstash-input-http_poller.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'logstash-input-http_poller'
-  s.version         = '3.1.0'
+  s.version         = '3.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/logstash-plugin install gemname. This gem is not a stand-alone program"

data/spec/inputs/http_poller_spec.rb

@@ -398,6 +398,7 @@ describe LogStash::Inputs::HTTP_Poller do
 
     describe "a valid request and decoded response" do
       let(:payload) { {"a" => 2, "hello" => ["a", "b", "c"]} }
+      let(:response_body) { LogStash::Json.dump(payload) }
       let(:opts) { default_opts }
       let(:instance) {
         klass.new(opts)
@@ -414,7 +415,7 @@ describe LogStash::Inputs::HTTP_Poller do
         instance.register
         u = url.is_a?(Hash) ? url["url"] : url # handle both complex specs and simple string URLs
         instance.client.stub(u,
-                             :body => LogStash::Json.dump(payload),
+                             :body => response_body,
                              :code => code
         )
         allow(instance).to receive(:decorate)
@@ -430,6 +431,14 @@ describe LogStash::Inputs::HTTP_Poller do
       end
 
       include_examples("matching metadata")
+      
+      context "with an empty body" do
+        let(:response_body) { "" }
+        it "should return an empty event" do
+          instance.send(:run_once, queue)
+          expect(event.get("[_http_poller_metadata][response_headers][content-length]")).to eql("0")
+        end
+      end
 
       context "with metadata omitted" do
         let(:opts) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-http_poller
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Elastic
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-14 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement