logstash-input-sqs_s3 1.1.14 → 1.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c7b1edc70467ae870ad4e0df52052b8611e8dd765d223fbf3e90eb9ec560d25
-  data.tar.gz: 7a01f9c7f382a57295698ecb3e9ec6e2b8d20fe6837b7d3c8466441e6445d4eb
+  metadata.gz: 7810b377cc95a8256dc0b9f331cf0b99cb0567fbc87e82dba5f586e9454d87a8
+  data.tar.gz: 7e8533137aa8aac6d3f47b0ba58835f95dc1a34dc088e498a767bdf7358d49d3
 SHA512:
-  metadata.gz: e84502589a34f8bc1c1b97e71d023924dcd70e420f192abce805c454865c31e650600ce456101095579944b8ca1af5dd233ff57f67e8cf523ba73ec1f85dd964
-  data.tar.gz: 2a62a8259dad9ada95048376c614487780659ef78371ca7c71b8aaf60566f9d587713a7e4f683db39d50339cb1e82ee237fd76c7866fb8aa85e08de177b07c7c
+  metadata.gz: 6fb3e428faa96009cbe150a0317c9c584113170a92ad908b37399f665ea2c7797db5bad48948a5c8fec49b21d47acf7fb5fd8b5dc5d0b84906c0f04badb380b1
+  data.tar.gz: 4cc96ead08ac6c7e59c0ab5c8df323dabd99dddfe94be7d899145c91c93f4e8c8d3c48cd5c964bd85bb341185fd99271d83bb65baa5ebf403234704a64c31a04

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.1.15
+- Fixed throttle error
+
 ## 1.1.14
 - Fixed compilation error
 

data/lib/logstash/inputs/sqs_s3.rb

@@ -193,7 +193,7 @@ class LogStash::Inputs::SQSS3 < LogStash::Inputs::Threadable
 	      # assess currently running load (in MB)
               @current_load += (record['s3']['object']['size'].to_f / 1000000)
 
-	      lines = body.read.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: "\u2370")
+	      lines = body.read.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: "\u2370").split(/\n/)
 
 	      # Set the codec to json if required, otherwise the default is plain text
               if response.content_type == "application/json" then
@@ -201,13 +201,11 @@ class LogStash::Inputs::SQSS3 < LogStash::Inputs::Threadable
 		
 		if response.content_encoding != "gzip" then
 		  # If it's json in plain text, need to remove whitespaces
-		  lines = lines.gsub(/\s+/, "").split(/\n/)
-		else
-		  lines = lines.split(/\n/)
+		  # TODO...
 		end
               else
                 @codec = @plainCodec
-		lines = lines.split(/\n/)
+		#lines = lines.split(/\n/)
               end
 
               lines.each do |line|
@@ -259,15 +257,15 @@ class LogStash::Inputs::SQSS3 < LogStash::Inputs::Threadable
       # Throttle requests is overloaded by big files
       if @current_load > @max_load_before_throttling/1000000 then
 	throttle_seconds_sleep = @seconds_to_throttle * (@current_load / (@max_load_before_throttling.to_f/1000000)).floor
-        @logger.warn("**********Current load has exceeded " + (@max_load_before_throttling.to_f/1000000).to_s + " MB. Load is currently: " + @current_load.to_s + ". Throttling back by " + throttle_seconds_sleep)
+        @logger.warn("**********Current load has exceeded " + (@max_load_before_throttling.to_f/1000000).to_s + " MB. Load is currently: " + @current_load.to_s + ". Throttling back by " + throttle_seconds_sleep.to_s)
 
+	# Cap the throttle time to 1 min
         if(throttle_seconds_sleep != 0) then
-          sleep(throttle_seconds_sleep)
-        end
-
-	# Cap the throttle time to 2 min
-        if(throttle_seconds_sleep > 120) then
-          sleep(120)
+	  if(throttle_seconds_sleep > 60) then
+            sleep(60)
+	  else
+	    sleep(throttle_seconds_sleep)
+          end
         end
       end
 

data/logstash-input-sqs_s3.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-input-sqs_s3'
-  s.version         = '1.1.14'
+  s.version         = '1.1.15'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Get logs from AWS s3 buckets as issued by an object-created event via sqs."
   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. Full credit goes to Heiko Finzel. Republishing this gem to support Logstash 5."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-sqs_s3
 version: !ruby/object:Gem::Version
-  version: 1.1.14
+  version: 1.1.15
 platform: ruby
 authors:
 - Heiko Finzel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement