sidekiq-failures 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Unreleased
 
+## 0.2.1
+  * Fix exhausted mode when retry is disabled (@wr0ngway)
+
 ## 0.2.0
   * Added processor identity to failure data (@krasnoukhov)
   * Handle Sidekiq::Shutdown exceptions (@krasnoukhov)

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    sidekiq-failures (0.2.0)
+    sidekiq-failures (0.2.1)
       sidekiq (>= 2.2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    celluloid (0.14.0)
+    celluloid (0.14.1)
       timers (>= 1.0.0)
-    connection_pool (1.0.0)
+    connection_pool (1.1.0)
     hike (1.2.1)
     json (1.8.0)
     multi_json (1.7.3)
@@ -22,8 +22,8 @@ GEM
     redis (3.0.4)
     redis-namespace (1.3.0)
       redis (~> 3.0.0)
-    sidekiq (2.12.0)
-      celluloid (>= 0.14.0)
+    sidekiq (2.12.4)
+      celluloid (>= 0.14.1)
       connection_pool (>= 1.0.0)
       json
       redis (>= 3.0)

data/lib/sidekiq/failures/middleware.rb

@@ -58,7 +58,7 @@ module Sidekiq
       end
 
       def last_try?
-        retry_count == max_retries - 1
+        ! msg['retry'] || retry_count == max_retries - 1
       end
 
       def retry_count

data/lib/sidekiq/failures/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Failures
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/test/middleware_test.rb

@@ -93,7 +93,7 @@ module Sidekiq
       it "doesn't record failure if going to be retired again and configured to track exhaustion by default" do
         Sidekiq.failures_default_mode = :exhausted
 
-        msg = create_work('class' => MockWorker.to_s, 'args' => ['myarg'] )
+        msg = create_work('class' => MockWorker.to_s, 'args' => ['myarg'], 'retry' => true )
 
         assert_equal 0, failures_count
 
@@ -107,7 +107,7 @@ module Sidekiq
 
 
       it "doesn't record failure if going to be retired again and configured to track exhaustion" do
-        msg = create_work('class' => MockWorker.to_s, 'args' => ['myarg'], 'failures' => 'exhausted')
+        msg = create_work('class' => MockWorker.to_s, 'args' => ['myarg'], 'retry' => true, 'failures' => 'exhausted')
 
         assert_equal 0, failures_count
 
@@ -120,7 +120,35 @@ module Sidekiq
       end
 
       it "records failure if failing last retry and configured to track exhaustion" do
-        msg = create_work('class' => MockWorker.to_s, 'args' => ['myarg'], 'retry_count' => 24, 'failures' => 'exhausted')
+        msg = create_work('class' => MockWorker.to_s, 'args' => ['myarg'], 'retry' => true, 'retry_count' => 24, 'failures' => 'exhausted')
+
+        assert_equal 0, failures_count
+
+        assert_raises TestException do
+          @processor.process(msg)
+        end
+
+        assert_equal 1, failures_count
+        assert_equal 1, $invokes
+      end
+
+      it "records failure if retry disabled and configured to track exhaustion" do
+         msg = create_work('class' => MockWorker.to_s, 'args' => ['myarg'], 'retry' => false, 'failures' => 'exhausted')
+ 
+         assert_equal 0, failures_count
+ 
+         assert_raises TestException do
+           @processor.process(msg)
+         end
+ 
+         assert_equal 1, failures_count
+         assert_equal 1, $invokes
+       end
+ 
+      it "records failure if retry disabled and configured to track exhaustion by default" do
+        Sidekiq.failures_default_mode = 'exhausted'
+
+        msg = create_work('class' => MockWorker.to_s, 'args' => ['myarg'], 'retry' => false)
 
         assert_equal 0, failures_count
 
@@ -135,7 +163,7 @@ module Sidekiq
       it "records failure if failing last retry and configured to track exhaustion by default" do
         Sidekiq.failures_default_mode = 'exhausted'
 
-        msg = create_work('class' => MockWorker.to_s, 'args' => ['myarg'], 'retry_count' => 24)
+        msg = create_work('class' => MockWorker.to_s, 'args' => ['myarg'], 'retry' => true, 'retry_count' => 24)
 
         assert_equal 0, failures_count
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-failures
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4370758603814256180
+      hash: -2579273263044937702
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4370758603814256180
+      hash: -2579273263044937702
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23