resque-retry 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a25bee5749bed00ecedbe4e671973adaedb833864efd07cdfaa0050c9c1af042
-  data.tar.gz: c39a7fc54e5b203612548a7f95dce2fcca70d69a6c9338fbd926d4090d2952db
+  metadata.gz: 755ea6078469205b32e916d32d7dbb57a668e409d559b32ec7a5b21560a515c8
+  data.tar.gz: 98e9eb8627d4641771f66e8811d29bfc2e1baab52b5a38809bb4a0005e465480
 SHA512:
-  metadata.gz: 4b65fc789f26a14fabbade5a6cd15e3d6d0ca7ac5aac93d314a12bcbf15e6c3d8d89522c0baa58fdb9f9b22bb49cb5fc9f2abb628ff8ef0fd704439b1a08ac5d
-  data.tar.gz: 7fbc42c237c1bc8c620c6964ff7cb9579996e59cbecdfe6d37bfc58530da0460f633f0985074a9b77c42c3536b375c6a4daf619cc671a2b253e29fccafa762e9
+  metadata.gz: 475ca16f0d0814aa68ca14ff1ba2ec30c037526b69432052e8b88940e26964cb6e25ce71282a8161796d91ccae1ebfff23b43956485f5ae6b820e83aa00bb06b
+  data.tar.gz: 1d6870270be5df0c1a9820879ebfef192bbaa2a7cbe16199e5c8c319bd8b5f7a5a2207105646ebc0a3a99221a1defeab520727053649cfa310025caadc7d1520

data/HISTORY.md

@@ -1,3 +1,7 @@
+# 1.7.2 (2019-11-21)
+
+* Address part 2 of issue #158
+
 # 1.7.1 (2019-07-10)
 
 * Prevent `NoMethodError` when calculating `retry_delay`

data/lib/resque-retry/version.rb

@@ -1,3 +1,3 @@
 module ResqueRetry
-  VERSION = '1.7.1'
+  VERSION = '1.7.2'
 end

data/lib/resque/plugins/retry.rb

@@ -456,7 +456,8 @@ module Resque
         # set/update the "retry_key" expiration
         if expire_retry_key_after
           log_message "updating expiration for retry key: #{retry_key}", args
-          Resque.redis.expire(retry_key, retry_delay + expire_retry_key_after)
+          exception_class = Object.const_get(args[0]) rescue nil
+          Resque.redis.expire(retry_key, retry_delay(exception_class) + expire_retry_key_after)
         end
       end
 

data/test/retry_test.rb

@@ -287,6 +287,12 @@ class RetryTest < Minitest::Test
     perform_next_job(@worker)
   end
 
+  def test_expire_key_set_with_retry_exceptions
+    Resque.redis.expects(:expire).once.with(ExpiringJobWithRetryExceptions.redis_retry_key(StandardError), 17)
+    Resque.enqueue(ExpiringJobWithRetryExceptions, StandardError)
+    perform_next_job(@worker)
+  end
+
   def test_expire_key_setting_on_the_fly
     retry_key = 'resque-retry:FailFiveTimesWithCustomExpiryJob'
 

data/test/test_jobs.rb

@@ -7,7 +7,7 @@ class NoRetryJob
   @queue = :testing
 
   def self.perform(*args)
-    raise "error"
+    raise 'error'
   end
 end
 
@@ -28,6 +28,17 @@ class ExpiringJob
   end
 end
 
+class ExpiringJobWithRetryExceptions
+  extend Resque::Plugins::Retry
+
+  @queue = :testing
+  @expire_retry_key_after = 10
+  @retry_exceptions = { StandardError => 7 }
+
+  def self.perform(*args)
+  end
+end
+
 class RetryDefaultSettingsJob
   extend Resque::Plugins::Retry
   @queue = :testing

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-retry
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Luke Antins
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A resque plugin; provides retry, delay and exponential backoff support for