logstash-input-s3-sns-sqs 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b252a2e8b2c9ef1fa911f4f3032508ddfda53411
-  data.tar.gz: 10b201c1f0e1a2a5858682efa109c99da3d0d3bf
+  metadata.gz: ed1788afadf83807b126ee90abb0bc0d07852bdf
+  data.tar.gz: 64c1c4a0d088339c66e234b68607191e4a733115
 SHA512:
-  metadata.gz: 75f71948df7e26e7ac607219532cdb1a8df156ada93dab895560fbcf215b06308e1e900cc6c21450d395a9ec5d48a841e6c3104fd244e380074e2337088d6d5a
-  data.tar.gz: ad9ef3e7094750e8976cd6b02ebfb9cbedbf4ac15ee6585b91c76d9de237436bf8e3a684cbed336db029e0c0c1a748b6989a12af73e4bce2487e0194699b0159
+  metadata.gz: 086ea149de024ca358c9ca48b1a1d1e557dea44f550c428d42ff05c4ee6c5d263e9ff9c534f00a90e9e58738cb4dd6c02f8a65d831d46d7e980aba5b11df85bd
+  data.tar.gz: f6d21b1564c83997d20ef60a05be2f28efa9e90c29a63acea5d93073afef24ed732457300dd59dbf5843460ef3976155fd68648bf5630472256470240c6be175

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 1.4.2
+- Fix: Thread shutdown method should kill in case of wakeup fails
 ## 1.4.1
 - Fix: Last event in file not decorated
 - Adjust metadata namings

data/lib/logstash/inputs/s3snssqs.rb

@@ -295,7 +295,7 @@ class LogStash::Inputs::S3SNSSQS < LogStash::Inputs::Threadable
       event.set("[@metadata][s3]", { "object_key" => key })
       event.set("[@metadata][s3]", { "bucket_name" => bucket })
       if match=/#{s3_key_prefix}\/?(?<type_folder>.*?)\/.*/.match(key)
-        event.set('[@metadata][s3]', {"s3_object_folder" => match['type_folder']})
+        event.set('[@metadata][s3]', {"object_folder" => match['type_folder']})
       end
     end
   end
@@ -392,7 +392,15 @@ class LogStash::Inputs::S3SNSSQS < LogStash::Inputs::Threadable
 
   public
   def stop
-    @runner_threads.each { |c| c.wakeup }
+    @runner_threads.each do |c|
+      begin
+        @logger.info("Stopping thread ... ", :thread => c.inspect)
+        c.wakeup
+      rescue
+        @logger.error("Cannot stop thread ... try to kill him", :thread => c.inspect)
+        c.kill
+      end
+    end
   end
 
   private

data/logstash-input-s3-sns-sqs.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-input-s3-sns-sqs'
-  s.version         = '1.4.1'
+  s.version         = '1.4.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Get logs from AWS s3 buckets as issued by an object-created event via sns -> 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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-s3-sns-sqs
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Christian Herweg