logstash-input-httpclient 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfffe002abaff65c15fae28f60bdb26c96a49296
-  data.tar.gz: a0ccb1d87c692aa0a408d1565000a7f758fc28d6
+  metadata.gz: 34f259c605e9064ef201bcf35e71b9aa20b82dc8
+  data.tar.gz: b9d6f9eab9ad654bc368dbd708f7f7ad7193cf01
 SHA512:
-  metadata.gz: a2d781b3211acb8ccf50e73c1fa8d64fc3edcd8e15d176df3f1787c5596277a3e8cdad396cafb82129858715742709b623284191f670475ca596ca779290bf6e
-  data.tar.gz: 41cf27bfe287f24232626b2ee3d82a3a63f53adb5d0dcba29ea836b1e87a4a3254ecbfa978ba60d5f52b13f9df386a652aa330ca9d526be949efac2ef9c3adaf
+  metadata.gz: f58d38b040dda5c5bd5fbdbeb91b8438ac2c1962c1164f49b7d18c822cff00c76bf5822250b3ab55822db38f9005aefd8ecc5e60344d06fe1b6100c78d7b7525
+  data.tar.gz: 69193c447b6aa56d3cfc7c03a1c829c46d76f0e6197f2e1a3fce12d46e0e820694fb999619896bcbd0a96b6cbdf7e81acbaa37d8f89b0789dadadbf682ce1b97

data/lib/logstash/inputs/httpclient.rb

@@ -62,37 +62,46 @@ class LogStash::Inputs::HttpClient < LogStash::Inputs::Base
     queue_times = Array.new #track an average of how long it's taking to queue events into logstash
     #::start creates a connection to the HTTP server and keeps it alive for the duration
     Net::HTTP.start @uri.host, @uri.port, :use_ssl => @uri.scheme == 'https' do |http|
-      Stud.interval(@interval) do
+      while true
         begin
-          http_start = Time.now
-          request = Net::HTTP::Get.new(@uri.path)          
-          request ["X-Logstash-Avg-Queue-Secs"] = arr_avg(queue_times, 20, 3)
-          response = http.request request  # Net::HTTPResponse object
-          http_elapsed = Time.now - http_start
-        rescue => e
-          @logger.warn("Http request failed, will retry", :exception => e)
-          @logger.warn(e.backtrace)
-          sleep(@interval)
-          retry
-        end
-        #event = LogStash::Event.new("message" => response.body)
-        @codec.decode(response.body) do |event|
-          event[@response_object_name] = {}
-          if @include_response_headers 
-            event[@response_object_name]["headers"] = response
+          sleepIval = @interval
+          begin
+            http_start = Time.now
+            request = Net::HTTP::Get.new(@uri.request_uri)
+            request ["X-Logstash-Avg-Queue-Secs"] = arr_avg(queue_times, 20, 3)
+            response = http.request request  # Net::HTTPResponse object
+            http_elapsed = Time.now - http_start
+          rescue => e
+            @logger.warn("Http request failed, will retry", :exception => e)
+            @logger.warn(e.backtrace)
+            sleep(sleepIval)
+            retry
           end
-          if @include_response_code 
-            event[@response_object_name]["code"] = response.code
+
+          if response["X-More-Events-Available"] == "true"
+            sleepIval = 0 #don't wait if the server indicated there are more events ready now
           end
-          if @include_http_request_time 
-            event[@response_object_name]["took_secs"] = http_elapsed
+
+          @codec.decode(response.body) do |event|
+            event[@response_object_name] = {}
+            if @include_response_headers 
+              event[@response_object_name]["headers"] = response
+            end
+            if @include_response_code 
+              event[@response_object_name]["code"] = response.code
+            end
+            if @include_http_request_time 
+              event[@response_object_name]["took_secs"] = http_elapsed
+            end
+            decorate(event)
+            queue_start = Time.now
+            queue << event
+            queue_elapsed = Time.now - queue_start
+            queue_times.push queue_elapsed
           end
-          decorate(event)
-          queue_start = Time.now
-          queue << event
-          queue_elapsed = Time.now - http_start
-          queue_times.push queue_elapsed
-        end
+        ensure
+          sleep(@interval)
+        end 
       end #interval loop
     end #HTTP keepalive
   end # def run

data/logstash-input-httpclient.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-httpclient'
-  s.version         = '0.1.0'
+  s.version         = '0.2.0'
   s.licenses = ['Apache License (2.0)']
   s.summary = "This input queries a http url at a regular interval and sends the responses to 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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-httpclient
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - bradvido
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core