logstash-input-sqs_s3 1.1.11 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce23436ab12a6338357103a266e7089f26f6b712a6e31a6aed6f13aa1e126320
-  data.tar.gz: 522158ec1d2e7676f8e81c261a1831590c8400984d673bea732557c7fb6ff0e7
+  metadata.gz: d9a94aef8c03a9df8145522e48b48942a6fb355675cbb244e54d07b4bfc78fb7
+  data.tar.gz: ed70e0cb422c557900aa59b507527c5fdc59e34e4d06c45ac379906d9dd3e1e3
 SHA512:
-  metadata.gz: 02d7d0d16509f8dd41fea01a87e910e06d7f11ebe2dc4042a4ae37cf546cf236240725ba1de7034be3fd96ccd20bc22dd1e9fea7de8527f5aaaa70726937d1bb
-  data.tar.gz: 04da6fd348db1dae7d6f9895d4c88b92f459d495dd1bf3f13720a0541328088e32bf195ad57811ac61816ed2895c77adf996742149824c4486ee7b5077e05d13
+  metadata.gz: c5029542e78e3671d4a29f152f719fb651f184a774cd2608933e65310c03fd5a4977e549bfeb68920b68b6cb1de32b952743e1e76196912d8da516bcd389dd01
+  data.tar.gz: 1f5deb0bc501959d6c6fa7220ac075c1dcb8a71ee89e938df54d50baea2bd5511f6679291fb99a175eed052621d0569820dd5c6e1e47a5f14a3b60c507f2d39c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.1.12
+- Updated codec use based on content type and resolved compilation error
+
 ## 1.1.11
 - Added content encoding and content type to events
 

data/lib/logstash/inputs/sqs_s3.rb

@@ -127,6 +127,8 @@ class LogStash::Inputs::SQSS3 < LogStash::Inputs::Threadable
     @logger.info("Registering SQS input", :queue => @queue)
     @logger.info("Skip Delete", :skip_delete => @skip_delete)
     @current_load = 0.0
+    @jsonCodec = LogStash::Codecs::JSON.new
+    @plainCodec = LogStash::Codecs::Plain.new
     setup_queue
   end
 
@@ -191,6 +193,13 @@ class LogStash::Inputs::SQSS3 < LogStash::Inputs::Threadable
 	      # assess currently running load (in MB)
               @current_load += (record['s3']['object']['size'].to_f / 1000000)
 
+	      # Set the codec to json if required, otherwise the default is plain text
+              if response.content_type == "application/json" then
+                @codec = @jsonCodec
+              else
+                @codec = @plainCodec
+              end
+
               lines = body.read.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: "\u2370").split(/\n/)
               lines.each do |line|
                 @codec.decode(line) do |event|
@@ -240,9 +249,8 @@ class LogStash::Inputs::SQSS3 < LogStash::Inputs::Threadable
 
       # Throttle requests is overloaded by big files
       if @current_load > @max_load_before_throttling/1000000 then
-        @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 " + (@seconds_$
-
-        throttle_seconds_sleep = @seconds_to_throttle * (@current_load / (@max_load_before_throttling.to_f/1000000)).floor
+	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
 
         if(throttle_seconds_sleep != 0) then
           sleep(throttle_seconds_sleep)

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.11'
+  s.version         = '1.1.12'
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-sqs_s3
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.12
 platform: ruby
 authors:
 - Heiko Finzel