sidekiq-unique-jobs 6.0.11 → 6.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4794cab4e8c46ab8a1c2f8d3f1f4a0e40eee2f5c0a78c1750816a4f08298fb3e
-  data.tar.gz: 5542da14289cd0287001c997b439f77445c9d7b7c13cc8307801a55012217a7c
+  metadata.gz: e400e981096ecad506646c8d3d8a57fdbe09628d344cd74bf3d4ebacaa717034
+  data.tar.gz: 8eb32a66471a6fc9a8ab9bc5f8717dde2a544151bfb65dedb8214072f9fb14a7
 SHA512:
-  metadata.gz: ee3cddb22fa61d68e5b209fbd129c5e8c1c88c3cb02feae0f1d0b869d3722ab9f8e5d08cf0a2d0bbcbb11be2205ee35e5f9202c24eb56cae360e79e4bacd54c9
-  data.tar.gz: e0c980ae65ac375cf0de4595b61ca4137c52ba0335d947560d7d7550f71db8873a4dca228e18f3319c3cdd551b7377a262133c1d7b66ad8daf9a8143b3fdd4f2
+  metadata.gz: 0036cec9334f5d1cf2ac814ed18efaff1adfe3cb372a8b593c686996ccade529faf18258c023313a64373a8d40389707cd5cc3515578f4b2a3062a7e2d9c51f5
+  data.tar.gz: b0513ccbbdb7a72fdaea163c6a943df2b97bdcfcd4dad1637f28adfc8eb3f8107fa0a0ca0613ddd21fb0e91f5a82c1822913d9b7663df43f6b7ff739035b26a6

data/CHANGELOG.md

@@ -1,16 +1,44 @@
 # Change Log
 
-## [v6.0.10](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v6.0.10) (2019-02-23)
-[Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.9...v6.0.10)
+## [v6.0.11](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v6.0.11) (2019-02-24)
+[Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.10...v6.0.11)
+
+**Implemented enhancements:**
+
+- Reduce leftover keys [\#374](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/374) ([mhenrixon](https://github.com/mhenrixon))
+- Prepare for sidekiq 6 [\#373](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/373) ([mhenrixon](https://github.com/mhenrixon))
+
+**Fixed bugs:**
+
+- Prevent memory leaks \(many locks stay in memory\) [\#368](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/368)
+- :until\_and\_while\_executing not processing queued jobs after executing [\#355](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/355)
+- Version 6: lets you schedule job with missing arguments [\#351](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/351)
+- Version 6 Ignores Jobs Enqueued in Version 5 [\#345](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/345)
+- Job will not enqueue even with no existing match [\#342](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/342)
+- Convert v5 locks when needed [\#375](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/375) ([mhenrixon](https://github.com/mhenrixon))
+- Reduce leftover keys [\#374](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/374) ([mhenrixon](https://github.com/mhenrixon))
 
 **Closed issues:**
 
-- Unsure of sane defaults [\#372](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/372)
+- Infinite lock using until\_and\_while\_executing after sidekiq restart [\#361](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/361)
+- getting a crash using lock\_expiration on v6.0.6 [\#350](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/350)
+- Problem when job failed and is retrying [\#332](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/332)
 
 **Merged pull requests:**
 
+- Clarify lock expiration in readme [\#376](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/376) ([mhenrixon](https://github.com/mhenrixon))
+
+## [v6.0.10](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v6.0.10) (2019-02-23)
+[Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.9...v6.0.10)
+
+**Implemented enhancements:**
+
 - Log job silently complete [\#371](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/371) ([tadejm](https://github.com/tadejm))
 
+**Closed issues:**
+
+- Unsure of sane defaults [\#372](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/372)
+
 ## [v6.0.9](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v6.0.9) (2019-02-11)
 [Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.8...v6.0.9)
 

data/lib/sidekiq_unique_jobs/locksmith.rb

@@ -86,13 +86,8 @@ module SidekiqUniqueJobs
     # @return [true, false]
     def locked?(token = nil)
       token ||= jid
-      Scripts.call(
-        :convert_legacy_lock,
-        redis_pool,
-        keys: [grabbed_key, unique_digest],
-        argv: [token],
-      )
 
+      convert_legacy_lock(token)
       redis(redis_pool) { |conn| conn.hexists(grabbed_key, token) }
     end
 
@@ -100,6 +95,15 @@ module SidekiqUniqueJobs
 
     attr_reader :unique_digest, :ttl, :jid, :redis_pool, :lock_type
 
+    def convert_legacy_lock(token)
+      Scripts.call(
+        :convert_legacy_lock,
+        redis_pool,
+        keys: [grabbed_key, unique_digest],
+        argv: [token, current_time.to_f],
+      )
+    end
+
     def grab_token(timeout = nil)
       redis(redis_pool) do |conn|
         if timeout.nil? || timeout.positive?

data/lib/sidekiq_unique_jobs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqUniqueJobs
-  VERSION = "6.0.11"
+  VERSION = "6.0.12"
 end

data/redis/convert_legacy_lock.lua

@@ -2,20 +2,12 @@ local grabbed_key   = KEYS[1]
 local unique_digest = KEYS[2]
 
 local job_id = ARGV[1]
-
-local function current_time()
-  local time = redis.call('time')
-  local s = time[1]
-  local ms = time[2]
-  local number = tonumber((s .. '.' .. ms))
-
-  return number
-end
+local current_time = tonumber(ARGV[2])
 
 local old_token  = redis.call('GET', unique_digest)
 if old_token then
   if old_token == job_id or old_token == '2' then
     redis.call('DEL', unique_digest)
-    redis.call('HSET', grabbed_key, job_id, current_time())
+    redis.call('HSET', grabbed_key, job_id, current_time)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 6.0.11
+  version: 6.0.12
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-24 00:00:00.000000000 Z
+date: 2019-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby