sidekiq_unique_retries 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6577679bf6a5b58b52e3e632538c8facc8508423
-  data.tar.gz: b0a56f52bca88b9dd8970284575dbb803521a9ed
+SHA256:
+  metadata.gz: 73ec4f18c7a7f625a0f3ac3b64cfd6746d17d63216bde3091d8932a5accf6d30
+  data.tar.gz: 7810a2cc1ae216e80f277ae8ebb8745ba1d94e61bc4ee968b8d876a54a307d56
 SHA512:
-  metadata.gz: e0886eb08c1f1de23a4afaff414ef409e688305e264ad78a62855476ce0f36e996b6ed064ecdeae4f969818f2aba4f4ee65da5280d1cd0458946f2c93b595af5
-  data.tar.gz: c47f7c0a862c39a336480c1bf86626eeef319749f009a6bed789174f4a5bd0b1adb9fe9303f7c311c84d29064cd9af331f65a9e11efe9c2646dda12c04556fbe
+  metadata.gz: d829b790f6be6871a5f87e96dbe0f4da54a11b40a1035fb4558a509f4ac1d8926f988aa63f57e2433982feb87e454e3f5211053908b8e8bcbc8eaeea8fae87da
+  data.tar.gz: 2315dd54cbe375f8e3159864a1464fa05c865e9628d8a6cf6a27d340c60191b90425e72b2cdff62ce1026cf25eebe461d9c038cac423e911279e36edc5caa296

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+# Changelog
+
+## 0.2.0
+* Allow multiple retries for `while_executing` lock strategy because this is not unique lock actually

data/lib/sidekiq_unique_retries/adapters/sidekiq_unique_jobs.rb

@@ -1,12 +1,19 @@
 module SidekiqUniqueRetries
   module Adapters
     class SidekiqUniqueJobs
+      UNIQUE_RETRY_LOCKS = %w[
+        until_executing
+        until_executed
+        until_timeout
+        until_and_while_executing
+      ].freeze
 
       JOB_ID_KEY = 'jid'.freeze
-      UNIQUE_DIGEST_KEY = 'unique_digest'.freeze
+      LOCK_KEY = 'unique'.freeze
+      DIGEST_KEY = 'unique_digest'.freeze
 
       def lockable?(item)
-        item.key?(UNIQUE_DIGEST_KEY)
+        UNIQUE_RETRY_LOCKS.include?(item[LOCK_KEY])
       end
 
       def job_id(item)
@@ -14,9 +21,8 @@ module SidekiqUniqueRetries
       end
 
       def unique_digest(item)
-        item.fetch(UNIQUE_DIGEST_KEY)
+        item.fetch(DIGEST_KEY)
       end
-
     end
   end
 end

data/lib/sidekiq_unique_retries/extensions/api.rb

@@ -3,7 +3,6 @@ require 'sidekiq/api'
 module SidekiqUniqueRetries
   module Extensions
     module SortedEntry
-
       def delete
         if SidekiqUniqueRetries.lockable?(item)
           SidekiqUniqueRetries.unlock(item)
@@ -27,7 +26,6 @@ module SidekiqUniqueRetries
 
         super
       end
-
     end
   end
 end

data/lib/sidekiq_unique_retries/extensions/job_retry.rb

@@ -3,13 +3,16 @@ require 'sidekiq/job_retry'
 module SidekiqUniqueRetries
   module Extensions
     module JobRetry
-
       def attempt_retry(worker, msg, queue, exception)
         if SidekiqUniqueRetries.lockable?(msg)
-          raise exception unless SidekiqUniqueRetries.lock(msg)
+          if SidekiqUniqueRetries.lock(msg)
+            super
+          else
+            logger.info { "Ignore retry for #{msg['class']} job #{msg['jid']}" }
+          end
+        else
+          super
         end
-
-        super(worker, msg, queue, exception)
       end
 
       def retries_exhausted(worker, msg, exception)
@@ -17,9 +20,8 @@ module SidekiqUniqueRetries
           SidekiqUniqueRetries.unlock(msg)
         end
 
-        super(worker, msg, exception)
+        super
       end
-
     end
   end
 end

data/lib/sidekiq_unique_retries/lock.rb

@@ -48,5 +48,4 @@ module SidekiqUniqueRetries
       end
     end
   end
-
 end

data/sidekiq_unique_retries.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "sidekiq_unique_retries"
-  spec.version       = "0.1.0"
+  spec.version       = "0.2.0"
   spec.authors       = ["Andriy Yanko"]
   spec.email         = ["andriy.yanko@railsware.com"]
 
@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sidekiq", ">= 5.0.0"
+  spec.add_dependency "sidekiq", "~> 5.2"
 
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_unique_retries
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Andriy Yanko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +76,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -106,10 +107,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Uniqueness for Sidekiq Retries
 test_files: []
-has_rdoc: