shoryuken 3.1.10 → 3.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dda2c81b7db286ab0286fc53d6f809a94036827
-  data.tar.gz: d95cc4ea313c9df67a3fa91147874f5361ddbdbf
+  metadata.gz: 790d69004ca82f39b30f5c8bc94a22666c5d4dae
+  data.tar.gz: 64d8533b1e113cf735d235b39390096e4fe66501
 SHA512:
-  metadata.gz: cd5ce448af5d501a27b15419617dec8c38d03f7134898f617b8a9fe23c291917186f00918c962f11cf45dca19c9ff6d87c7f85c805f265edce3dc0b6dfa686e9
-  data.tar.gz: 33baff2079043bea32abf2d372035301e4ceadf65b9156caa3140233a643578113df2790cd2211e92b0502164388fc99087ece4f8ebebf6e202a840accd4deee
+  metadata.gz: 6fb9d015a01aef9d4f0288872e52ec05302f18d74594080b8c8220669fb5ccf822fff031bd36ddd94094371f471c6af95b253217ef3ee5a5ebc76979f13b1289
+  data.tar.gz: 0a00108dbbbf108a98f2d571d6635f8cf49c7230608b3d9c776a770f6c3cc61b6ccdee9a162c05d7dfa41e7921ef1756cfd546fe285bfd0ccb8e874fdb0699b8

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [v3.1.11] - 2017-09-02
+
+- Auto retry (up to 3 times) fetch errors
+ - [#429](https://github.com/phstc/shoryuken/pull/429)
+
 ## [v3.1.10] - 2017-09-02
 
 - Make Shoryuken compatible with AWS SDK 3 and 2

data/lib/shoryuken/fetcher.rb

@@ -9,20 +9,41 @@ module Shoryuken
     end
 
     def fetch(queue, limit)
-      started_at = Time.now
+      fetch_with_auto_retry(3) do
+        started_at = Time.now
 
-      logger.debug { "Looking for new messages in #{queue}" }
+        logger.debug { "Looking for new messages in #{queue}" }
 
-      sqs_msgs = Array(receive_messages(queue, [FETCH_LIMIT, limit].min))
+        sqs_msgs = Array(receive_messages(queue, [FETCH_LIMIT, limit].min))
 
-      logger.info { "Found #{sqs_msgs.size} messages for #{queue.name}" } unless sqs_msgs.empty?
-      logger.debug { "Fetcher for #{queue} completed in #{elapsed(started_at)} ms" }
+        logger.info { "Found #{sqs_msgs.size} messages for #{queue.name}" } unless sqs_msgs.empty?
+        logger.debug { "Fetcher for #{queue} completed in #{elapsed(started_at)} ms" }
 
-      sqs_msgs
+        sqs_msgs
+      end
     end
 
     private
 
+    def fetch_with_auto_retry(max_attempts, &block)
+      attempts = 0
+
+      begin
+        yield
+      rescue => ex
+        # Tries to auto retry connectivity errors
+        raise if attempts >= max_attempts
+
+        attempts += 1
+
+        logger.debug { "Retrying fetch attempt #{attempts} for #{ex.message}" }
+
+        sleep((1..5).to_a.sample)
+
+        retry
+      end
+    end
+
     def receive_messages(queue, limit)
       options = receive_options(queue)
 

data/lib/shoryuken/manager.rb

@@ -12,6 +12,7 @@ module Shoryuken
       @max_processors   = concurrency
       @busy_processors  = Concurrent::AtomicFixnum.new(0)
       @executor         = executor
+      @running          = Concurrent::AtomicBoolean.new(true)
     end
 
     def start
@@ -21,7 +22,7 @@ module Shoryuken
     private
 
     def running?
-      @executor.running?
+      @running.true? && @executor.running?
     end
 
     def dispatch_loop
@@ -104,6 +105,8 @@ module Shoryuken
       logger.error { ex.backtrace.join("\n") } unless ex.backtrace.nil?
 
       Process.kill('USR1', Process.pid)
+
+      @running.make_false
     end
   end
 end

data/lib/shoryuken/version.rb

@@ -1,3 +1,3 @@
 module Shoryuken
-  VERSION = '3.1.10'.freeze
+  VERSION = '3.1.11'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 3.1.10
+  version: 3.1.11
 platform: ruby
 authors:
 - Pablo Cantero