Sum the x-death to handle failures with different reasons

jondot · Apr 21, 2015 · 13ff822 · 13ff822
1 parent 11cdcbc
commit 13ff822
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/sneakers/handlers/maxretry.rb b/lib/sneakers/handlers/maxretry.rb
@@ -168,10 +168,12 @@ def failure_count(headers)
           x_death_array = headers['x-death'].select do |x_death|
             x_death['queue'] == @worker_queue_name
           end
-          if x_death_array.count != 1
-            x_death_array.count
+          if x_death_array.count > 0 && x_death_array.first['count']
+            # Newer versions of RabbitMQ return headers with a count key
+            x_death_array.inject(0) {|sum, x_death| sum + x_death['count']}
           else
-            x_death_array.first['count'] || 1
+            # Older versions return a separate x-death header for each failure
+            x_death_array.count
           end
         end
       end