sidekiq-retries 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87c2aac2892ffd9e2b44612ab5f37a1fa78388e9
-  data.tar.gz: 6dc7a56dee7f165c425f2272656ec773530556d3
+  metadata.gz: 5f60b5afa37dea410255c1b748aa0274ed065f5b
+  data.tar.gz: e4658e58fa25eda6e6483907a2804cc789fc42f2
 SHA512:
-  metadata.gz: c341f9fb8bca656566987dee920e37be30dba4b785402cf38088275c6c15a63cb09ee9ba476839ae5d6c3f07999947e9d066e5c3638cc84fe1a3128de82d1d07
-  data.tar.gz: edab40f7f4331d138dc7f24b9ce1d637a740329bdea797483f0dc15ec8336eea29822cc89301a3f8027a8be1a851cac205944c13e7fed854793911b05b15d66c
+  metadata.gz: ead691bdce28f57974d1f10eacd84eaac9158ac4e6c0dc5dcb81ea62a8224ab4158166e7d10945247898ad46def81d5eb4c1d1aced48767b2ccc19f7ba8a427f
+  data.tar.gz: e818436af75490f09ed2215da50b27bba1a6ed351a9758ce44bdeb106db963dd0d4f8e75f30eed58639486bb401416f09d9e498ff86537570e0fd05eec901f9d

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+cache: bundler
+rvm:
+  - 2.1.2
+  - jruby-19mode
+services:
+  - redis-server

data/Gemfile

@@ -7,4 +7,5 @@ group :development, :test do
   gem 'redcarpet', :platform => :ruby
   gem 'yard'
   gem 'pry'
+  gem 'sidekiq', git: 'https://github.com/mperham/sidekiq.git'
 end

data/HISTORY.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.0
+* stop cutting + pasting Sidekiq retry logic, which is now extracted into a method (https://github.com/mperham/sidekiq/pull/1928)
+* require sidekiq 3.2.4
+
 ## 0.2.0
 * simplify retry/fail logic
 * fix retry: 0, which was going straight to the dead queue

data/README.md

@@ -1,7 +1,17 @@
 # Sidekiq::Retries
 
-This subclasses the stock Sidekiq retries middleware to give you some additional options to conditionally retry jobs
-irrespective of whether retries are enabled for the job.
+[![Build Status](https://travis-ci.org/govdelivery/sidekiq-retries.svg?branch=master)](https://travis-ci.org/govdelivery/sidekiq-retries)
+
+This subclasses the stock Sidekiq retries middleware so that you can
+
+* retry a job that has retries disabled (retry: 0 or retry: false)
+* abort (don't retry) a job that will otherwise retry by default
+
+but still have the job raise an exception so that you can observe that the job failed (by checking the logs,
+using sidekiq-failures, etc.).
+
+Don't use this as a replacement for making your jobs idempotent!
+
 
 ## Installation
 
@@ -9,6 +19,8 @@ Add this line to your application's Gemfile:
 
     gem 'sidekiq-retries'
 
+
+
 ## Usage
 
     class NoRetryJob
@@ -16,7 +28,7 @@ Add this line to your application's Gemfile:
       sidekiq_options retry: false  # or retry: 0
 
       def perform
-        # force a retry
+        # retry this job when it otherwise would not
         raise Sidekiq::Retries::Retry.new(RuntimeError.new('whatever happened'))        
       end
     end
@@ -26,14 +38,10 @@ Add this line to your application's Gemfile:
       sidekiq_options retry: 25
     
       def perform                        
-        # fail the job, don't retry it 
+        # don't retry this particular job
         raise Sidekiq::Retries::Fail.new(RuntimeError.new('whatever happened'))
       end
     end
-    
-## Caveats
-
-* Jobs with retry: 0 don't ever appear to show up in the Sidekiq 3 Dead queue
 
 ## Contributing
 

data/Rakefile

@@ -1,3 +1,5 @@
+require "rubygems"
+require "bundler/setup"
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 

data/lib/sidekiq/retries/server/middleware.rb

@@ -20,56 +20,10 @@ module Sidekiq
           # seriously, don't retry this
           raise e.cause
         rescue Exception => e
-          attempt_retry(worker, msg, queue, e) if msg['retry']
-          raise e
-        end
-
-        private
-
-        # This is the default Sidekiq 3.2.2 retry logic
-        def attempt_retry(worker, msg, queue, e)
           # ignore, will be pushed back onto queue during hard_shutdown
           raise Sidekiq::Shutdown if exception_caused_by_shutdown?(e)
-
           raise e unless msg['retry']
-          max_retry_attempts = retry_attempts_from(msg['retry'], @max_retries)
-
-          msg['queue'] = if msg['retry_queue']
-            msg['retry_queue']
-          else
-            queue
-          end
-          msg['error_message'] = e.message[0..10_000]
-          msg['error_class'] = e.class.name
-          count = if msg['retry_count']
-            msg['retried_at'] = Time.now.to_f
-            msg['retry_count'] += 1
-          else
-            msg['failed_at'] = Time.now.to_f
-            msg['retry_count'] = 0
-          end
-
-          if msg['backtrace'] == true
-            msg['error_backtrace'] = e.backtrace
-          elsif msg['backtrace'] == false
-            # do nothing
-          elsif msg['backtrace'].to_i != 0
-            msg['error_backtrace'] = e.backtrace[0..msg['backtrace'].to_i]
-          end
-
-          if count < max_retry_attempts
-            delay = delay_for(worker, count)
-            logger.debug { "Failure! Retry #{count} in #{delay} seconds" }
-            retry_at = Time.now.to_f + delay
-            payload = Sidekiq.dump_json(msg)
-            Sidekiq.redis do |conn|
-              conn.zadd('retry', retry_at.to_s, payload)
-            end
-          else
-            # Goodbye dear message, you (re)tried your best I'm sure.
-            retries_exhausted(worker, msg)
-          end
-
+          attempt_retry(worker, msg, queue, e)
           raise e
         end
 

data/lib/sidekiq/retries/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Retries
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/sidekiq-retries.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency            'sidekiq', '~>3.0'
+  spec.add_dependency 'sidekiq', '>= 3.2.4', '~>3.2'
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-retries
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Benjamin Ortega
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.4
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.4
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +136,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - HISTORY.md
 - LICENSE.txt