resque-retry 1.7.4 → 1.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab175830aa9de0d24e514a8bd054b1ebe8a2924ba134fd975013685e84828b9d
-  data.tar.gz: a6cb49fb45375e4a82a8811e126f428de4acda1248d7b6cc6de5df6d9b6340bf
+  metadata.gz: bcd42f2b0761226dd2cfa5f9c9d4ff336cda1be0f6acf972ae15cd553f88fa0b
+  data.tar.gz: d65b4261a3ff1068f9880739ea1f4647c10be957511840203331f714cb8281dc
 SHA512:
-  metadata.gz: f4176df779bbc212e25d64190ae7680ee410beebb663d6b502f45fd73532b14fa4ed9f86dc76e74474dd757247b45b0a8503037a6154c814ffad159dec22413a
-  data.tar.gz: 2109a5558025ff2d7b5b8e1cd952242aad11641b11b1036332d2f68111c1d6ca5f9de402ec92376aedff37d6dff534bed0e017196e85f451b976e405168a71da
+  metadata.gz: 78c8fccf7a670f1fc0246d7e8862941eae3fb2bda8ea4d11fb1bea2a5890ed1867f50ff9389a752f3383bf5383783b32e3f63c5ef623909a28aaeba62f4576a2
+  data.tar.gz: 8e3e0ed80d154282e6dddd85b8b7b95b22949d580ad6c0c7a0fc9c3a16475dca861320f919db0f2ddf6b8dca78e8bdd846a48b86db6a5761848d6d4fcb7012a4

data/.github/workflows/ci.yml

@@ -0,0 +1,24 @@
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    services:
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+    strategy:
+      matrix:
+        ruby-version: [2.7, 2.6]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake

data/.gitignore

@@ -14,3 +14,5 @@ tags.*
 *.gem
 .ruby-version
 .ruby-gemset
+.tags
+dump.rdb

data/HISTORY.md

@@ -1,3 +1,14 @@
+# 1.7.6 (2021-08-06)
+
+* Fix Redis 4.3 breaking saving job failures with multiple failure backend
+* Disable verbose logging by default during test-runs
+* Remove support for ruby < 2.6
+
+# 1.7.5 (2021-08-06)
+
+* Support `retry_delay` methods with different arity
+* Switch over to _GitHub_ CI for PR test-execution
+
 # 1.7.4 (2020-10-09)
 
 * Rework how the default `retry_limit` is calculated

data/lib/resque-retry/version.rb

@@ -1,3 +1,3 @@
 module ResqueRetry
-  VERSION = '1.7.4'
+  VERSION = '1.7.6'
 end

data/lib/resque/failure/multiple_with_retry_suppression.rb

@@ -42,10 +42,25 @@ module Resque
           )
 
           cleanup_retry_failure_log!
-          super
-        elsif retry_delay > 0
+          return super
+        end
+
+        # some plugins define retry_delay and have it take no arguments, so rather than break those,
+        # we'll just check here to see whether it takes the additional exception class argument or not
+        # we also allow all job args to be passed to a custom `retry_delay` method
+        retry_delay_arity = klass.method(:retry_delay).arity
+
+        calculated_retry_delay = if [-2, 2].include?(retry_delay_arity)
+          klass.retry_delay(exception.class, *args)
+        elsif [-1, 1].include?(retry_delay_arity)
+          klass.retry_delay(exception.class)
+        else
+          klass.retry_delay
+        end
+
+        if calculated_retry_delay > 0
           log_message(
-            "retry_delay: #{retry_delay} > 0 - saving details in Redis",
+            "retry_delay: #{calculated_retry_delay} > 0 - saving details in Redis",
             args,
             exception
           )
@@ -63,12 +78,12 @@ module Resque
 
           Resque.redis.setex(
             failure_key,
-            2 * retry_delay,
+            2 * calculated_retry_delay,
             data
           )
         else
           log_message(
-            "retry_delay: #{retry_delay} <= 0 - ignoring",
+            "retry_delay: #{calculated_retry_delay} <= 0 - ignoring",
             args,
             exception
           )
@@ -117,10 +132,6 @@ module Resque
         Resque::Job.new(nil, nil).constantize(payload['class'])
       end
 
-      def retry_delay
-        klass.retry_delay
-      end
-
       def retry_key
         klass.redis_retry_key(*payload['args'])
       end
@@ -132,7 +143,17 @@ module Resque
       end
 
       def retrying?
-        Resque.redis.exists(retry_key)
+        redis_key_exists?(retry_key)
+      end
+
+      private
+
+      def redis_key_exists?(key)
+        if Resque.redis.respond_to?(:exists?)
+          Resque.redis.exists?(key)
+        else
+          ![false, 0].include?(Resque.redis.exists(key) || false)
+        end
       end
     end
   end

data/test/multiple_failure_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative './test_helper'
 
 # Mock failure backend for testing MultipleWithRetrySuppression
 class MockFailureBackend < Resque::Failure::Base
@@ -25,8 +25,8 @@ class MultipleFailureTest < Minitest::Test
     Resque::Failure.backend = Resque::Failure::MultipleWithRetrySuppression
   end
 
-  def failure_key_for(klass)
-    'failure-' + klass.redis_retry_key([])
+  def failure_key_for(klass, *args)
+    Resque::Failure::MultipleWithRetrySuppression.failure_key(klass.redis_retry_key(args))
   end
 
   def test_failure_is_passed_on_when_job_class_not_found
@@ -53,6 +53,22 @@ class MultipleFailureTest < Minitest::Test
     assert Resque.redis.exists(key)
   end
 
+  def test_retry_delay_is_calculated_with_custom_calculation
+    delay = 5
+    Resque.enqueue(DynamicDelayedJobOnExceptionAndArgs, delay.to_s)
+    perform_next_job(@worker)
+
+    key = failure_key_for(DynamicDelayedJobOnExceptionAndArgs, delay.to_s)
+    ttl = Resque.redis.ttl(key)
+    assert Resque.redis.exists(key)
+    assert MockFailureBackend.errors.size == 0
+
+    # expiration on failure_key is set to 2x the delay
+    # to ensure the customized delay is properly calculated using
+    # dynamic retry_delay method on the job
+    assert ttl > delay && delay <= (delay * 2)
+  end
+
   def test_retry_key_splatting_args
     # were expecting this to be called three times:
     # - once when we queue the job to try again
@@ -141,6 +157,20 @@ class MultipleFailureTest < Minitest::Test
     end
   end
 
+  def test_redis_exists_returns_integer
+    Resque.enqueue(RetryDefaultsJob)
+    original = Redis.exists_returns_integer
+    Redis.exists_returns_integer = true
+
+    3.times do
+      perform_next_job(@worker)
+    end
+
+    Redis.exists_returns_integer = original
+
+    assert_equal 1, MockFailureBackend.errors.size
+  end
+
   def teardown
     Resque::Failure.backend = @old_failure_backend
   end

data/test/test_helper.rb

@@ -1,6 +1,8 @@
 dir = File.dirname(File.expand_path(__FILE__))
 $LOAD_PATH.unshift dir + '/../lib'
+
 $TESTING = true
+$VERBOSE = ENV['VERBOSE'] != 'true' ? nil : true
 
 # Run code coverage in MRI 1.9 only.
 if RUBY_VERSION >= '1.9' && RUBY_ENGINE == 'ruby'
@@ -20,25 +22,29 @@ require 'mocha/setup'
 require 'resque-retry'
 require dir + '/test_jobs'
 
-# make sure we can run redis-server
-if !system('which redis-server')
-  puts '', "** `redis-server` was not found in your PATH"
-  abort ''
-end
+if ENV['CI'] != 'true'
+  # make sure we can run redis-server
+  if !system('which redis-server')
+    puts '', "** `redis-server` was not found in your PATH"
+    abort ''
+  end
 
-# make sure we can shutdown the server using cli.
-if !system('which redis-cli')
-  puts '', "** `redis-cli` was not found in your PATH"
-  abort ''
-end
+  # make sure we can shutdown the server using cli.
+  if !system('which redis-cli')
+    puts '', "** `redis-cli` was not found in your PATH"
+    abort ''
+  end
 
-# This code is run after all the tests have finished running to ensure that the
-# Redis server is shutdowa
-Minitest.after_run { `redis-cli -p 9736 shutdown nosave` }
+  # This code is run after all the tests have finished running to ensure that the
+  # Redis server is shutdowa
+  Minitest.after_run { `redis-cli -p 9736 shutdown nosave` }
 
-puts "Starting redis for testing at localhost:9736..."
-`redis-server #{dir}/redis-test.conf`
-Resque.redis = '127.0.0.1:9736'
+  puts "Starting redis for testing at localhost:9736..."
+  `redis-server #{dir}/redis-test.conf`
+  Resque.redis = '127.0.0.1:9736'
+else
+  Resque.redis = '127.0.0.1:6379'
+end
 
 # Test helpers
 class Minitest::Test
@@ -65,11 +71,11 @@ class Minitest::Test
 
   def delayed_jobs
     # The double-checks here are so that we won't blow up if the config stops using redis-namespace
-    timestamps = Resque.redis.zrange("resque:delayed_queue_schedule", 0, -1) + 
+    timestamps = Resque.redis.zrange("resque:delayed_queue_schedule", 0, -1) +
                  Resque.redis.zrange("delayed_queue_schedule", 0, -1)
 
     delayed_jobs_as_json = timestamps.map do |timestamp|
-      Resque.redis.lrange("resque:delayed:#{timestamp}", 0, -1) + 
+      Resque.redis.lrange("resque:delayed:#{timestamp}", 0, -1) +
       Resque.redis.lrange("delayed:#{timestamp}", 0, -1)
     end.flatten
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-retry
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.6
 platform: ruby
 authors:
 - Luke Antins
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -161,8 +161,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - HISTORY.md
 - LICENSE
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: A resque plugin; provides retry, delay and exponential backoff support for

data/.travis.yml

@@ -1,14 +0,0 @@
-language: ruby
-
-sudo: false
-
-matrix:
-  allow_failures:
-    - rvm: jruby-9.1.9.0
-
-rvm:
-  - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
-  - jruby-9.1.9.0