Fix: stop poller when input is being shutdown (#65)

Co-authored-by: Daniel Popescu <[email protected]>
logstash-plugins · Mar 17, 2022 · 5d7aaec · 5d7aaec
1 parent 26dc976
commit 5d7aaec
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 3.3.2
+  - Fix an issue that prevented timely shutdown when subscribed to an inactive queue
+
 ## 3.3.1
   - Refactoring: used logstash-mixin-aws to leverage shared code to manage `additional_settings` [#64](https://github.com/logstash-plugins/logstash-input-sqs/pull/64)
 

diff --git a/lib/logstash/inputs/sqs.rb b/lib/logstash/inputs/sqs.rb
@@ -119,7 +119,10 @@ def queue_url(aws_sqs_client)
 
   def setup_queue
     aws_sqs_client = Aws::SQS::Client.new(aws_options_hash || {})
-    @poller = Aws::SQS::QueuePoller.new(queue_url(aws_sqs_client), :client => aws_sqs_client)
+    poller = Aws::SQS::QueuePoller.new(queue_url(aws_sqs_client), :client => aws_sqs_client)
+    poller.before_request { |stats| throw :stop_polling if stop? }
+
+    @poller = poller
   rescue Aws::SQS::Errors::ServiceError, Seahorse::Client::NetworkingError => e
     @logger.error("Cannot establish connection to Amazon SQS", exception_details(e))
     raise LogStash::ConfigurationError, "Verify the SQS queue name and your credentials"

diff --git a/logstash-input-sqs.gemspec b/logstash-input-sqs.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-input-sqs'
-  s.version         = '3.3.1'
+  s.version         = '3.3.2'
   s.licenses        = ['Apache-2.0']
   s.summary         = "Pulls events from an Amazon Web Services Simple Queue Service queue"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"