sidekiq-unique-jobs 7.0.0.beta18 → 7.0.0.beta19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb3027ef2ed3a7a9a35732783f58c8ea1b55052b6c10c6d8de9acb6e44df389a
-  data.tar.gz: ad1baf2e0ad2aa7813109e6cd96aacab888d1bdefb58bcc5b5e5561bbb02404c
+  metadata.gz: 0533eff22c876bdbba1624e7bd997a0bfaa1254fe372bfc24fc67c95d2001eaf
+  data.tar.gz: 8bf21d326a04268bab7b4981af462649724a9e1ea5d312cdc5fe1e58b23f40d7
 SHA512:
-  metadata.gz: 7c6f06b180fbedd9b17c46e0fac20c7d1729571f830e8c01ea3bc63418cec618d4cfe3c8baa52319923e041960d6504e91488d5f59b41f7b7fa5960635a6142d
-  data.tar.gz: 68e8314bb873315007aa6abe1fb6f8cdf132b76720ef7623329ddb46244dd8f275902aeceac3cdbf19f82dd3cd5b9de8dc6f57856199cbd1748c1c54ca4977f2
+  metadata.gz: 645799c00a61c3665c63eaf77203c20db9220188aa757a19799a1f1863a8949fc2e8a71e023d8f3b39f3583534d74903dc39a7c6926c0c7ec37fa16ee61d9801
+  data.tar.gz: 5da81c81bd550d9181190d583aa742d4ee65cc2a7a470ce5f7d3e595b74244ac9af39757900f9a7d7ecee0792f27022679080cde87b5c202c50b495b011e3727

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [v7.0.0.beta18](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v7.0.0.beta18) (2020-05-21)
+
+[Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.0.0.beta17...v7.0.0.beta18)
+
+**Fixed bugs:**
+
+- Stringify on\_conflict hash in Job prepare method [\#507](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/507) ([jasonbekolay](https://github.com/jasonbekolay))
+
 ## [v7.0.0.beta17](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v7.0.0.beta17) (2020-05-20)
 
 [Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.0.0.beta16...v7.0.0.beta17)

data/lib/sidekiq_unique_jobs/orphans/manager.rb

@@ -10,6 +10,8 @@ module SidekiqUniqueJobs
     module Manager
       module_function
 
+      DRIFT_FACTOR = 0.02
+
       include SidekiqUniqueJobs::Connection
       include SidekiqUniqueJobs::Logging
 
@@ -56,6 +58,7 @@ module SidekiqUniqueJobs
         @task ||= Concurrent::TimerTask.new(timer_task_options) do
           with_logging_context do
             redis do |conn|
+              refresh_reaper_mutex
               Orphans::Reaper.call(conn)
             end
           end
@@ -117,7 +120,9 @@ module SidekiqUniqueJobs
       # @return [true, false]
       #
       def registered?
-        redis { |conn| conn.get(UNIQUE_REAPER) }.to_i == 1
+        redis do |conn|
+          conn.get(UNIQUE_REAPER).to_i + drift_reaper_interval > current_timestamp
+        end
       end
 
       def disabled?
@@ -131,7 +136,17 @@ module SidekiqUniqueJobs
       # @return [void]
       #
       def register_reaper_process
-        redis { |conn| conn.set(UNIQUE_REAPER, 1) }
+        redis { |conn| conn.set(UNIQUE_REAPER, current_timestamp, nx: true, ex: drift_reaper_interval) }
+      end
+
+      #
+      # Updates mutex key
+      #
+      #
+      # @return [void]
+      #
+      def refresh_reaper_mutex
+        redis { |conn| conn.set(UNIQUE_REAPER, current_timestamp, ex: drift_reaper_interval) }
       end
 
       #
@@ -143,6 +158,14 @@ module SidekiqUniqueJobs
       def unregister_reaper_process
         redis { |conn| conn.del(UNIQUE_REAPER) }
       end
+
+      def drift_reaper_interval
+        reaper_interval + (reaper_interval * DRIFT_FACTOR).to_i
+      end
+
+      def current_timestamp
+        Time.now.to_i
+      end
     end
   end
 end

data/lib/sidekiq_unique_jobs/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 7.0.0.beta18
+  version: 7.0.0.beta19
 platform: ruby
 authors:
 - Mikael Henriksson