sidekiq-unique-jobs 7.0.0.beta8 → 7.0.0.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 613b92887d9b07c1e2c0e485a553c3abd9b9586cc3a7026562b20fb1da751459
-  data.tar.gz: 3638999cdae0b55a4fdc1210ac38aa96782ac139dacb5167692921fd061f7a0f
+  metadata.gz: a24246a99460117c9ebacb054dc8d1860e3a330058f3c4f34d409125136ffc22
+  data.tar.gz: 662a626190317ed24ecc5453a936437824166bf5b08cbb9e96187bb63f1d091b
 SHA512:
-  metadata.gz: 613e5e3feeb4e61eee2d2d64a6a648bcef199526b42ad0ef682ead1f91ba6efa8945d01f1ba0379ae5acc4f44e27377ab320990db68822449ab3dab0a4bbb85f
-  data.tar.gz: 8802925c25b1f32552dcaf6329a90c4c9f825ea828f85c2c7570a2a359fa0cbf20f4102d5908c27e2ea210f671b7ac2b878096a1b6e905222faf5d1e357d3d5c
+  metadata.gz: a406b1f3f3f73a39f4c50b44417cbc1b6a83492c5e5c4dea71055cda9eca8c5139e667d2a1d4363e952f07e4e918b96455734cfd6285a753cdf3af026c2ab7eb
+  data.tar.gz: 99742c266e02ef86cfefd96a3c694b986f6d5610fca49877b7fd0f5d14ddcef4abadb6e65ae00b53de1fe71830d74210a9f7ff3237e3aecb141f9c9c5efdcf30

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [v7.0.0.beta8](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v7.0.0.beta8) (2019-11-28)
+
+[Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.0.0.beta7...v7.0.0.beta8)
+
+**Implemented enhancements:**
+
+- Allow worker to configure client and server strategies separately [\#402](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/402)
+- Separate client and server on\_conflict [\#462](https://github.com/mhenrixon/sidekiq-unique-jobs/pull/462) ([mhenrixon](https://github.com/mhenrixon))
+
+**Fixed bugs:**
+
+- `while\_executing` has problems at low concurrency [\#384](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/384)
+- lock: :until\_and\_while\_executing not working for scheduled jobs [\#334](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/334)
+
+**Closed issues:**
+
+- Custom Locks with error [\#392](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/392)
+- :until\_executed jobs get stuck every now and then [\#379](https://github.com/mhenrixon/sidekiq-unique-jobs/issues/379)
+
 ## [v7.0.0.beta7](https://github.com/mhenrixon/sidekiq-unique-jobs/tree/v7.0.0.beta7) (2019-11-28)
 
 [Full Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.0.0.beta6...v7.0.0.beta7)

data/lib/sidekiq_unique_jobs/locksmith.rb

@@ -177,7 +177,7 @@ module SidekiqUniqueJobs
       enqueue(conn) do
         primed_async(conn) do
           locked_token = call_script(:lock, key.to_a, argv, conn)
-          return yield job_id if locked_token == job_id
+          return yield if locked_token == job_id
         end
       end
     ensure
@@ -195,7 +195,9 @@ module SidekiqUniqueJobs
     # @return [Object] whatever the block returns when lock was acquired
     #
     def primed_async(conn)
-      return yield if Concurrent::Promises.future(conn) { |red_con| pop_queued(red_con) }.value
+      return yield if Concurrent::Promises
+                      .future(conn) { |red_con| pop_queued(red_con) }
+                      .value(drift(config.ttl))
 
       warn_about_timeout
     end
@@ -211,12 +213,12 @@ module SidekiqUniqueJobs
     # @yieldparam [String] job_id a Sidekiq JID
     #
     def lock_sync(conn)
-      return yield job_id if locked?(conn)
+      return yield if locked?(conn)
 
       enqueue(conn) do
         primed_sync(conn) do
           locked_token = call_script(:lock, key.to_a, argv, conn)
-          return yield job_id if locked_token == job_id
+          return yield if locked_token
         end
       end
     end
@@ -284,7 +286,7 @@ module SidekiqUniqueJobs
       return unless queued_token && (validity >= 0 || config.pttl.zero?)
 
       write_lock_info(conn)
-      yield queued_token
+      yield
     end
 
     #

data/lib/sidekiq_unique_jobs/middleware.rb

@@ -80,7 +80,7 @@ module SidekiqUniqueJobs
       @redis_pool   = redis_pool
       return yield if unique_disabled?
 
-      SidekiqUniqueJobs::Job.add_uniqueness(item)
+      SidekiqUniqueJobs::Job.add_uniqueness(item) unless item.key?(UNIQUE_DIGEST)
 
       with_logging_context do
         super

data/lib/sidekiq_unique_jobs/on_conflict/reschedule.rb

@@ -7,6 +7,8 @@ module SidekiqUniqueJobs
     # @author Mikael Henriksson <mikael@zoolutions.se>
     class Reschedule < OnConflict::Strategy
       include SidekiqUniqueJobs::SidekiqWorkerMethods
+      include SidekiqUniqueJobs::Logging
+      include SidekiqUniqueJobs::JSON
 
       # @param [Hash] item sidekiq job hash
       def initialize(item, redis_pool = nil)
@@ -17,7 +19,12 @@ module SidekiqUniqueJobs
       # Create a new job from the current one.
       #   This will mess up sidekiq stats because a new job is created
       def call
-        worker_class&.perform_in(5, *item[ARGS]) if sidekiq_worker_class?
+        if sidekiq_worker_class?
+          log_info("Rescheduling #{item[UNIQUE_DIGEST]}")
+          worker_class&.perform_in(5, *item[ARGS])
+        else
+          log_warn("Skip rescheduling of #{item[UNIQUE_DIGEST]} because #{worker_class} is not a Sidekiq::Worker")
+        end
       end
     end
   end

data/lib/sidekiq_unique_jobs/orphans/manager.rb

@@ -21,6 +21,7 @@ module SidekiqUniqueJobs
       #
       def start # rubocop:disable
         return if registered?
+        return if disabled?
 
         with_logging_context do
           register_reaper_process
@@ -73,6 +74,13 @@ module SidekiqUniqueJobs
           timeout_interval: reaper_timeout }
       end
 
+      #
+      # @see SidekiqUniqueJobs::Config#reaper
+      #
+      def reaper
+        SidekiqUniqueJobs.config.reaper
+      end
+
       #
       # @see SidekiqUniqueJobs::Config#reaper_interval
       #
@@ -112,6 +120,10 @@ module SidekiqUniqueJobs
         redis { |conn| conn.get(UNIQUE_REAPER) }.to_i == 1
       end
 
+      def disabled?
+        reaper == :none
+      end
+
       #
       # Writes a mutex key to redis
       #

data/lib/sidekiq_unique_jobs/profiler.rb

@@ -34,12 +34,12 @@ module SidekiqUniqueJobs
 
     def self.start
       Thread.current[:_method_profiler] = {
-        __start: Process.clock_gettime(Process::CLOCK_MONOTONIC),
+        __start: current_timestamp,
       }
     end
 
     def self.stop
-      finish = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      finish = current_timestamp
       return unless (data = Thread.current[:_method_profiler])
 
       Thread.current[:_method_profiler] = nil
@@ -47,5 +47,9 @@ module SidekiqUniqueJobs
       data[:total_duration] = finish - start
       data
     end
+
+    def self.current_timestamp
+      Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    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.beta8"
+  VERSION = "7.0.0.beta9"
 end

data/lib/sidekiq_unique_jobs/web.rb

@@ -2,7 +2,7 @@
 
 begin
   require "sidekiq/web"
-rescue LoadError # rubocop:disable Lint/HandleExceptions
+rescue LoadError # rubocop:disable Lint/SuppressedException
   # client-only usage
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 7.0.0.beta8
+  version: 7.0.0.beta9
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brpoplpush-redis_script