sidekiq-unique-jobs 6.0.2 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc7f82e3d04720a79501ea98300940be276d16484b840fcb29cbde5d9b02d4d0
-  data.tar.gz: 2c591c1695107e8afb57dc7ba67451ddcd28518251ce0515ec6fb032ae558975
+  metadata.gz: e13fe0c30a750cead8f45300cdbe03caa9764e8c84064e411b05fb5eebc34f47
+  data.tar.gz: 8511c7d945ffad30aade383c8b79090f2fdc05f8d0e69673f0fbefd9a8ac6409
 SHA512:
-  metadata.gz: 1b27618d4859b77a8960bc8779e9d62a39c856b58fc6d3cabf3b6650c2021f1288b41224a81fe4c5339a42fb7e20ec02b64f4455fdf2b3e250529aec436b4c51
-  data.tar.gz: 0aab133cbd5ae5ca3b16af1c5995a32cd455e2eef50ab896bbeaf494da6b222f7c198fca0ba1f2e523c449fcad5515d5ee98b63919d9600d6c6465e0b30084a4
+  metadata.gz: 152c64c9c6e200677efda852adf0db068c1f39031d9975da0d339710ed6d94d78e434960d95a9417df70c859103c8036f9c35f90c3f07973c04ef958c814a8dc
+  data.tar.gz: b9823df969b1432395c29f88ebeb88cc20cea8af6dee1f9364c60574565204c68e63e4fedf0d1a3409f74ab2688aaa9426ab8a2581cdd2ef8962ce0a10a37d45

data/.reek.yml

@@ -58,19 +58,26 @@ detectors:
     - Array
   NilCheck:
     enabled: false
+  DataClump:
+    enabled: true
+    exclude:
+      - SidekiqUniqueJobs::Util
   FeatureEnvy:
     exclude:
-    - SidekiqUniqueJobs::OnConflict::Reject#push_to_deadset
+    - SidekiqUniqueJobs::Digests#batch_delete
+    - SidekiqUniqueJobs::Digests#page
     - SidekiqUniqueJobs::Logging#debug_item
+    - SidekiqUniqueJobs::OnConflict::Reject#push_to_deadset
     - SidekiqUniqueJobs::Util#batch_delete
-    - SidekiqUniqueJobs::Digests#batch_delete
+    - SidekiqUniqueJobs::Web::Helpers#cparams
   NestedIterators:
     exclude:
+    - SidekiqUniqueJobs::Digests#batch_delete
     - SidekiqUniqueJobs::Locksmith#create_lock
     - SidekiqUniqueJobs::Middleware#configure_client_middleware
     - SidekiqUniqueJobs::Middleware#configure_server_middleware
     - SidekiqUniqueJobs::Util#batch_delete
-    - SidekiqUniqueJobs::Digests#batch_delete
+    - SidekiqUniqueJobs::Util#keys_with_ttl
   TooManyInstanceVariables:
     exclude:
     - SidekiqUniqueJobs::Locksmith

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v6.0.2
+
+- Fixes sidekiq web pagination of unique digests
+- Fixes lock_expiration usage (Lua doesn't support expire after persisting a key)
+
+## v6.0.1
+
+- Remove unused method that causes conflict with sidekiq/web
+
 ## v6.0.0
 
 - Complete rewrite of the locking mechanism

data/README.md

@@ -379,7 +379,7 @@ end
 
 ## Debugging
 
-There are two ways to display and remove keys regarding uniqueness. The console way and the command line way.
+There are several ways of removing keys that are stuck. The prefered way is by using the unique extension to `Sidekiq::Web`. The old console and command line versions still work but might be deprecated in the future. It is better to search for the digest itself and delete the keys matching that digest.
 
 ### Sidekiq Web
 

data/lib/sidekiq_unique_jobs/lock/base_lock.rb

@@ -23,6 +23,7 @@ module SidekiqUniqueJobs
       # @return [String] the sidekiq job id
       def lock
         @attempt = 0
+        return item[JID_KEY] if locked?
 
         if (token = locksmith.lock(item[LOCK_TIMEOUT_KEY]))
           token

data/lib/sidekiq_unique_jobs/locksmith.rb

@@ -106,7 +106,7 @@ module SidekiqUniqueJobs
     end
 
     # Signal that the token should be released
-    # @param [String] token the unique token to check for a lockk.
+    # @param [String] token the unique token to check for a lock.
     #   nil will default to the jid provided in the initializer.
     # @return [Integer] the number of available lock resources
     def signal(token = nil)

data/lib/sidekiq_unique_jobs/on_conflict.rb

@@ -14,6 +14,7 @@ module SidekiqUniqueJobs
       log: OnConflict::Log,
       raise: OnConflict::Raise,
       reject: OnConflict::Reject,
+      replace: OnConflict::Replace,
       reschedule: OnConflict::Reschedule,
     }.freeze
 

data/lib/sidekiq_unique_jobs/on_conflict/replace.rb

@@ -2,7 +2,7 @@
 
 module SidekiqUniqueJobs
   module OnConflict
-    # Strategy to raise an error on conflict
+    # Strategy to replace the job on conflict
     #
     # @author Mikael Henriksson <mikael@zoolutions.se>
     class Replace < OnConflict::Strategy

data/lib/sidekiq_unique_jobs/util.rb

@@ -23,6 +23,20 @@ module SidekiqUniqueJobs
       redis { |conn| conn.scan_each(match: prefix(pattern), count: count).to_a }
     end
 
+    # Find unique keys with ttl
+    # @param [String] pattern a pattern to scan for in redis
+    # @param [Integer] count the maximum number of keys to delete
+    # @return [Hash<String, Integer>] a hash with active unique keys and corresponding ttl
+    def keys_with_ttl(pattern = SCAN_PATTERN, count = DEFAULT_COUNT)
+      hash = {}
+      redis do |conn|
+        conn.scan_each(match: prefix(pattern), count: count).each do |key|
+          hash[key] = conn.ttl(key)
+        end
+      end
+      hash
+    end
+
     # Deletes unique keys from redis
     #
     # @param [String] pattern a pattern to scan for in redis

data/lib/sidekiq_unique_jobs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqUniqueJobs
-  VERSION = '6.0.2'
+  VERSION = '6.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.0.3
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby