sidekiq-unique-jobs 7.0.0.beta11 → 7.0.0.beta12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e4b1d2afbe4126de1f3218b2b386bcd10fe9533b354a5694f6a419e2f4e8e3f
-  data.tar.gz: 46b8bc4b55ddaa883d06c31696e3e515bfe8d5094faaeeb4200f8a53983ba7dc
+  metadata.gz: 5099888d19251ef2ee0edc4cf6918d060faaeb3abc949b13bfb959f55dfdbb86
+  data.tar.gz: 92114bd7aa7b7d2834e683aca81fdf58ad7e9b6b4b73717101eae406fcc80f4f
 SHA512:
-  metadata.gz: 3ae95fa750d1775b5ed0b244a97b56539a20e3938eec6f9d9d45111d9017e78af0923bfe2683328bec63875f0fc89437bd28ddfce577db558f95a73257065506
-  data.tar.gz: 1535795137ca8836f2e62fb737503e82d9a4315e77d90e249e9b16979ced0d50cb8fc22e1d5f184b009d51c073490db81bce940e10b4ca9f343ab95d68fd5efa
+  metadata.gz: 42ecd0377617197773d37bd233191ec47bb4942338107f3251154b47d1148a60d963c722168dc4fd07af533886875383bc890376bbf4750ef39f2d94df66df90
+  data.tar.gz: 3b4805fb012f2b0a12633e63136b5a0759afd67556865d2ca358e3a05715d75aa543ab2f8c5aa940c433ba44c02188e96e9718f710f5fe4b8dca62bf73d2c1ea

data/CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## [Unreleased](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/HEAD)
+
+[Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.20...HEAD)
+
+**Fixed bugs:**
+
+- until\_expired is not setting TTL [\#468](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/468)
+
+## [v6.0.20](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v6.0.20) (2020-03-22)
+
+[Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.0.0.beta11...v6.0.20)
+
+**Fixed bugs:**
+
+- Deletion of digest doesn't work from admin UI [\#438](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/438)
+
+**Closed issues:**
+
+- Please keep some recent versions on rubygems.org [\#478](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/478)
+- validate\_worker! throws error [\#466](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/466)
+
+**Merged pull requests:**
+
+- Allow v7 configuration to work [\#479](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/479) ([mhenrixon](https://github.com/mhenrixon))
+
+## [v7.0.0.beta11](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v7.0.0.beta11) (2020-03-21)
+
+[Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.0.0.beta10...v7.0.0.beta11)
+
+**Fixed bugs:**
+
+- Only configure RSpec when constant is defined [\#477](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/477) ([mhenrixon](https://github.com/mhenrixon))
+
 ## [v7.0.0.beta10](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v7.0.0.beta10) (2020-03-21)
 
 [Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.19...v7.0.0.beta10)

data/lib/sidekiq_unique_jobs/lua/lock.lua

@@ -8,6 +8,7 @@ local changelog = KEYS[6]
 local digests   = KEYS[7]
 -------- END keys ---------
 
+
 -------- BEGIN lock arguments ---------
 local job_id       = ARGV[1]
 local pttl         = tonumber(ARGV[2])
@@ -15,6 +16,7 @@ local lock_type    = ARGV[3]
 local limit        = tonumber(ARGV[4])
 -------- END lock arguments -----------
 
+
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[5])
 local debug_lua    = ARGV[6] == "true"
@@ -23,6 +25,7 @@ local script_name  = tostring(ARGV[8]) .. ".lua"
 local redisversion = ARGV[9]
 ---------  END injected arguments ---------
 
+
 --------  BEGIN local functions --------
 <%= include_partial "shared/_common.lua" %>
 ----------  END local functions ----------
@@ -68,7 +71,7 @@ redis.call("LREM", primed, 1, job_id)
 
 -- The Sidekiq client should only set pttl for until_expired
 -- The Sidekiq server should set pttl for all other jobs
-if lock_type == "until_expired" and pttl and pttl > 0 then
+if pttl and pttl > 0 then
   log_debug("PEXPIRE", digest, pttl)
   redis.call("PEXPIRE", digest, pttl)
 

data/lib/sidekiq_unique_jobs/lua/queue.lua

@@ -8,13 +8,15 @@ local changelog = KEYS[6]
 local digests   = KEYS[7]
 -------- END keys ---------
 
+
 -------- BEGIN lock arguments ---------
-local job_id       = ARGV[1]      -- The job_id that was previously primed
-local pttl         = tonumber(ARGV[2])
-local lock_type    = ARGV[3]
-local limit        = tonumber(ARGV[4])
+local job_id    = ARGV[1]      -- The job_id that was previously primed
+local pttl      = tonumber(ARGV[2])
+local lock_type = ARGV[3]
+local limit     = tonumber(ARGV[4])
 -------- END lock arguments -----------
 
+
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[5])
 local debug_lua    = ARGV[6] == "true"
@@ -22,6 +24,7 @@ local max_history  = tonumber(ARGV[7])
 local script_name  = tostring(ARGV[8]) .. ".lua"
 ---------  END injected arguments ---------
 
+
 --------  BEGIN Variables --------
 local queued_count = redis.call("LLEN", queued)
 local locked_count = redis.call("HLEN", locked)
@@ -29,6 +32,7 @@ local within_limit = limit > locked_count
 local limit_exceeded = not within_limit
 --------   END Variables  --------
 
+
 --------  BEGIN local functions --------
 <%= include_partial "shared/_common.lua" %>
 ----------  END local functions ----------
@@ -70,7 +74,7 @@ redis.call("LPUSH", queued, job_id)
 
 -- The Sidekiq client should only set pttl for until_expired
 -- The Sidekiq server should set pttl for all other jobs
-if lock_type == "until_expired" and pttl > 0 then
+if pttl and pttl > 0 then
   log_debug("PEXPIRE", digest, pttl)
   redis.call("PEXPIRE", digest, pttl)
   log_debug("PEXPIRE", queued, pttl)

data/lib/sidekiq_unique_jobs/lua/unlock.lua

@@ -8,13 +8,15 @@ local changelog = KEYS[6]
 local digests   = KEYS[7]
 -------- END keys ---------
 
+
 -------- BEGIN lock arguments ---------
-local job_id = ARGV[1]
-local pttl   = tonumber(ARGV[2])
-local type   = ARGV[3]
-local limit  = tonumber(ARGV[4])
+local job_id    = ARGV[1]
+local pttl      = tonumber(ARGV[2])
+local lock_type = ARGV[3]
+local limit     = tonumber(ARGV[4])
 -------- END lock arguments -----------
 
+
 --------  BEGIN injected arguments --------
 local current_time = tonumber(ARGV[5])
 local debug_lua    = ARGV[6] == "true"
@@ -23,12 +25,14 @@ local script_name  = tostring(ARGV[8]) .. ".lua"
 local redisversion = ARGV[9]
 ---------  END injected arguments ---------
 
+
 --------  BEGIN Variables --------
 local queued_count = redis.call("LLEN", queued)
 local primed_count = redis.call("LLEN", primed)
 local locked_count = redis.call("HLEN", locked)
 ---------  END Variables ---------
 
+
 --------  BEGIN local functions --------
 <%= include_partial "shared/_common.lua" %>
 ----------  END local functions ----------
@@ -65,21 +69,12 @@ redis.call("LREM", primed, -1, job_id)
 log_debug("ZREM", digests, digest)
 redis.call("ZREM", digests, digest)
 
-if pttl and pttl > 0 then
-  log_debug("PEXPIRE", digest, pttl)
-  redis.call("PEXPIRE", digest, pttl)
-
-  log_debug("PEXPIRE", locked, pttl)
-  redis.call("PEXPIRE", locked, pttl)
-
-  log_debug("PEXPIRE", info, pttl)
-  redis.call("PEXPIRE", info, pttl)
-else
-  local redis_version = toversion(redisversion)
-  local del_cmd       = "DEL"
+local redis_version = toversion(redisversion)
+local del_cmd       = "DEL"
 
-  if tonumber(redis_version["major"]) >= 4 then del_cmd =  "UNLINK"; end
+if tonumber(redis_version["major"]) >= 4 then del_cmd =  "UNLINK"; end
 
+if lock_type ~= "until_expired" then
   log_debug(del_cmd, digest, info)
   redis.call(del_cmd, digest, info)
 
@@ -90,8 +85,8 @@ end
 log_debug("LPUSH", queued, "1")
 redis.call("LPUSH", queued, "1")
 
-log_debug("PEXPIRE", queued, 500)
-redis.call("PEXPIRE", queued, 500)
+log_debug("PEXPIRE", queued, 5000)
+redis.call("PEXPIRE", queued, 5000)
 
 log("Unlocked")
 log_debug("END unlock digest:", digest, "(job_id: " .. job_id ..")")

data/lib/sidekiq_unique_jobs/unlockable.rb

@@ -11,6 +11,13 @@ module SidekiqUniqueJobs
     # Unlocks a job.
     # @param [Hash] item a Sidekiq job hash
     def unlock(item)
+      SidekiqUniqueJobs::Job.add_digest(item)
+      SidekiqUniqueJobs::Locksmith.new(item).unlock
+    end
+
+    # Unlocks a job.
+    # @param [Hash] item a Sidekiq job hash
+    def unlock!(item)
       SidekiqUniqueJobs::Job.add_digest(item)
       SidekiqUniqueJobs::Locksmith.new(item).unlock!
     end

data/lib/sidekiq_unique_jobs/version.rb

@@ -3,5 +3,5 @@
 module SidekiqUniqueJobs
   #
   # @return [String] the current SidekiqUniqueJobs version
-  VERSION = "7.0.0.beta11"
+  VERSION = "7.0.0.beta12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 7.0.0.beta11
+  version: 7.0.0.beta12
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-21 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brpoplpush-redis_script
@@ -176,72 +176,72 @@ dependencies:
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.18
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 description: |
   Prevents simultaneous Sidekiq jobs with the same unique arguments to run.
   Highly configurable to suite your specific needs.