logstash-input-s3-sns-sqs 1.4.5 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d2ee1ae20a382ab708d3db9131f2025e238372e
-  data.tar.gz: 49fc208ab9ba5a142d8c7573108a8184a6b6aefa
+  metadata.gz: b306531064b4c30538ebf2825ad8ccd3cffc1723
+  data.tar.gz: 3166705bd066e00607cfb5f8f6e0b5d810934ef2
 SHA512:
-  metadata.gz: 6cb64dc332a7ffd69948d8ebe3cfa330cce023903d9d3b798f61a33effc67461780974e4f99c493a5b1d98e32a344fc516562d3832b084ec7ec1b2b8d4c4ef99
-  data.tar.gz: c13e35a7d8937e44a020fc07fe4521585d92ce3f0d7f0077ebde071d11b1b2c113376d2b5103c3d13111daf040cf8fda5695693bb7069e6cf242dff600d45ed0
+  metadata.gz: ee7ba71f4ed496dc0cc109ea1834d0da58d112c320fb6c8a80f33ee65ab9a1f0746976be6ad32f934c4f80f9a3c0688f94a64064f44d665bbce3f3d19bb699b0
+  data.tar.gz: b614c2c3945819b6e95052f1770920d57b83d5afb9300836e6af1375b45c93c15c7117b14fdd33372edbe746cc796e5b967dc75b131b03d9eb0e7ba73cd65797

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.4.6
+- BugFix: jRuby > 2 : No return from block
+- BugFix: No exit on gzip error
 ## 1.4.5
 - BugFix: undeclared var in rescue 
 ## 1.4.4

data/lib/logstash/inputs/s3snssqs.rb

@@ -98,9 +98,6 @@ class LogStash::Inputs::S3SNSSQS < LogStash::Inputs::Threadable
 
   default :codec, "plain"
 
-  # The message string to use in the event.
-  config :message, :validate => :string, :default => "Hello World!"
-
   # Name of the SQS Queue to pull messages from. Note that this is just the name of the queue, not the URL or ARN.
   config :queue, :validate => :string, :required => true
   config :s3_key_prefix, :validate => :string, :default => ''
@@ -148,22 +145,20 @@ class LogStash::Inputs::S3SNSSQS < LogStash::Inputs::Threadable
   end
 
   def setup_queue
-    begin
-      aws_sqs_client = Aws::SQS::Client.new(aws_options_hash)
-      queue_url = aws_sqs_client.get_queue_url({ queue_name: @queue, queue_owner_aws_account_id: @queue_owner_aws_account_id})[:queue_url]
-      @poller = Aws::SQS::QueuePoller.new(queue_url, :client => aws_sqs_client)
-      if s3_access_key_id and s3_secret_access_key
-        @logger.debug("Using S3 Credentials from config", :ID => aws_options_hash.merge(:access_key_id => s3_access_key_id, :secret_access_key => s3_secret_access_key) )
-        @s3_client = Aws::S3::Client.new(aws_options_hash.merge(:access_key_id => s3_access_key_id, :secret_access_key => s3_secret_access_key))
-      else
-        @s3_client = Aws::S3::Client.new(aws_options_hash)
-      end
-
-      @s3_resource = get_s3object
-    rescue Aws::SQS::Errors::ServiceError => e
-      @logger.error("Cannot establish connection to Amazon SQS", :error => e)
-      raise LogStash::ConfigurationError, "Verify the SQS queue name and your credentials"
+    aws_sqs_client = Aws::SQS::Client.new(aws_options_hash)
+    queue_url = aws_sqs_client.get_queue_url({ queue_name: @queue, queue_owner_aws_account_id: @queue_owner_aws_account_id})[:queue_url]
+    @poller = Aws::SQS::QueuePoller.new(queue_url, :client => aws_sqs_client)
+    if s3_access_key_id and s3_secret_access_key
+      @logger.debug("Using S3 Credentials from config", :ID => aws_options_hash.merge(:access_key_id => s3_access_key_id, :secret_access_key => s3_secret_access_key) )
+      @s3_client = Aws::S3::Client.new(aws_options_hash.merge(:access_key_id => s3_access_key_id, :secret_access_key => s3_secret_access_key))
+    else
+      @s3_client = Aws::S3::Client.new(aws_options_hash)
     end
+
+    @s3_resource = get_s3object
+  rescue Aws::SQS::Errors::ServiceError => e
+    @logger.error("Cannot establish connection to Amazon SQS", :error => e)
+    raise LogStash::ConfigurationError, "Verify the SQS queue name and your credentials"
   end
 
   def polling_options
@@ -351,8 +346,7 @@ class LogStash::Inputs::S3SNSSQS < LogStash::Inputs::Threadable
       block.call(line)
     end
   rescue ZipException => e
-    @logger.error("Gzip codec: We cannot uncompress the gzip file", :filename => filename)
-    raise e
+    @logger.error("Gzip codec: We cannot uncompress the gzip file", :filename => filename, error => e)
   ensure
     buffered.close unless buffered.nil?
     decoder.close unless decoder.nil?
@@ -473,10 +467,14 @@ class LogStash::Inputs::S3SNSSQS < LogStash::Inputs::Threadable
   private
   def hash_key_is_regex(myhash)
     myhash.default_proc = lambda do |hash, lookup|
+      result=nil
       hash.each_pair do |key, value|
-        return value if %r[#{key}] =~ lookup.to_s
+        if %r[#{key}] =~ lookup
+          result=value
+          break
+        end
       end
-      return nil
+      result
     end
   end
 end # class

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.5'
+  s.version         = '1.4.6'
   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.5
+  version: 1.4.6
 platform: ruby
 authors:
 - Christian Herweg