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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b252a2e8b2c9ef1fa911f4f3032508ddfda53411
4
- data.tar.gz: 10b201c1f0e1a2a5858682efa109c99da3d0d3bf
3
+ metadata.gz: ed1788afadf83807b126ee90abb0bc0d07852bdf
4
+ data.tar.gz: 64c1c4a0d088339c66e234b68607191e4a733115
5
5
  SHA512:
6
- metadata.gz: 75f71948df7e26e7ac607219532cdb1a8df156ada93dab895560fbcf215b06308e1e900cc6c21450d395a9ec5d48a841e6c3104fd244e380074e2337088d6d5a
7
- data.tar.gz: ad9ef3e7094750e8976cd6b02ebfb9cbedbf4ac15ee6585b91c76d9de237436bf8e3a684cbed336db029e0c0c1a748b6989a12af73e4bce2487e0194699b0159
6
+ metadata.gz: 086ea149de024ca358c9ca48b1a1d1e557dea44f550c428d42ff05c4ee6c5d263e9ff9c534f00a90e9e58738cb4dd6c02f8a65d831d46d7e980aba5b11df85bd
7
+ data.tar.gz: f6d21b1564c83997d20ef60a05be2f28efa9e90c29a63acea5d93073afef24ed732457300dd59dbf5843460ef3976155fd68648bf5630472256470240c6be175
data/CHANGELOG.md CHANGED
@@ -1,3 +1,5 @@
1
+ ## 1.4.2
2
+ - Fix: Thread shutdown method should kill in case of wakeup fails
1
3
  ## 1.4.1
2
4
  - Fix: Last event in file not decorated
3
5
  - Adjust metadata namings
@@ -295,7 +295,7 @@ class LogStash::Inputs::S3SNSSQS < LogStash::Inputs::Threadable
295
295
  event.set("[@metadata][s3]", { "object_key" => key })
296
296
  event.set("[@metadata][s3]", { "bucket_name" => bucket })
297
297
  if match=/#{s3_key_prefix}\/?(?<type_folder>.*?)\/.*/.match(key)
298
- event.set('[@metadata][s3]', {"s3_object_folder" => match['type_folder']})
298
+ event.set('[@metadata][s3]', {"object_folder" => match['type_folder']})
299
299
  end
300
300
  end
301
301
  end
@@ -392,7 +392,15 @@ class LogStash::Inputs::S3SNSSQS < LogStash::Inputs::Threadable
392
392
 
393
393
  public
394
394
  def stop
395
- @runner_threads.each { |c| c.wakeup }
395
+ @runner_threads.each do |c|
396
+ begin
397
+ @logger.info("Stopping thread ... ", :thread => c.inspect)
398
+ c.wakeup
399
+ rescue
400
+ @logger.error("Cannot stop thread ... try to kill him", :thread => c.inspect)
401
+ c.kill
402
+ end
403
+ end
396
404
  end
397
405
 
398
406
  private
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'logstash-input-s3-sns-sqs'
3
- s.version = '1.4.1'
3
+ s.version = '1.4.2'
4
4
  s.licenses = ['Apache License (2.0)']
5
5
  s.summary = "Get logs from AWS s3 buckets as issued by an object-created event via sns -> sqs."
6
6
  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 CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-input-s3-sns-sqs
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.1
4
+ version: 1.4.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Christian Herweg