sidekiq-unique-jobs 6.0.0.rc2 → 6.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ee36e00cd0663929ce027ef233084358ec02d6ab4dc26146fa716e22eab22ed
-  data.tar.gz: 05abdd365d0655d1df25a80c54d4530f62fb049a4c10bbe1c39a6e855902f8a2
+  metadata.gz: 040dccf5a4139ee93bdc4d8b76d641b54fd9048ed4e82efe653e08ed4c5cadae
+  data.tar.gz: 64059716024f596926a052d05da8cd27ec10e5cde5186cf84c6db2dd3e6b039f
 SHA512:
-  metadata.gz: ad6188cf8bdba50eee4e1c4fbb71c64e937e9452c5f4f4dabfebe141fadc53c28e63241d5cc1f6e45fa6d10aadedc735ce4d48a0ccec94e8c6609609bd7d3bb7
-  data.tar.gz: 464b147ec401b9d85f842ef4243d60a54b1e254a6a14487534be6a81d1e9d05ef399b2f42ea9721035eadd92c27b19ecfc61ce4df2f37277cec6f3fb7cb0dfc5
+  metadata.gz: 84fc218ebc8d22ebcb1b94a01344b313c8bf1dce2f7d89961edd8dee2307143fa9c75fe09b5c0ea46b0f736e93dc603b683202172727d55873b2aa2944225cf6
+  data.tar.gz: e0f78dea666c477a2b64929f82e85edfe5dfb6e1b21a030b2890761a3225e1baa619fd15df04cb1bad4dbfca77ea3334f3d7784f54e1da56662b35f943b3c656

data/.dockerignore

@@ -1,4 +1,4 @@
-tmp/restart.txt
-tmp/cache
-tmp/pids
-tmp/sockets
+.dockerignore
+.byebug_history
+log/*
+tmp/*

data/.reek

@@ -60,7 +60,9 @@ IrresponsibleModule:
 TooManyStatements:
   exclude:
   - initialize
-  - Hash#slice!
+  - Hash#slice
+  - SidekiqUniqueJobs::Locksmith#create_lock
+  - SidekiqUniqueJobs::Locksmith#expire_when_necessary
   - SidekiqUniqueJobs::Middleware#configure_server_middleware
   - SidekiqUniqueJobs::Server::Middleware#call
   - SidekiqUniqueJobs::UniqueArgs#filtered_args
@@ -91,9 +93,11 @@ NilCheck:
 FeatureEnvy:
   exclude:
   - SidekiqUniqueJobs::Lock::WhileExecutingReject#push_to_deadset
+  - SidekiqUniqueJobs::Logging#debug_item
   - SidekiqUniqueJobs::Util#batch_delete
 NestedIterators:
   exclude:
+  - SidekiqUniqueJobs::Locksmith#create_lock
   - SidekiqUniqueJobs::Middleware#configure_client_middleware
   - SidekiqUniqueJobs::Middleware#configure_server_middleware
   - SidekiqUniqueJobs::Util#batch_delete

data/examples/until_and_while_executing_job.rb

@@ -5,9 +5,10 @@
 class UntilAndWhileExecutingJob
   include Sidekiq::Worker
 
-  sidekiq_options queue: :working, unique: :until_and_while_executing, lock_timeout: 0
+  sidekiq_options queue: :working, unique: :until_and_while_executing, lock_timeout: 0, lock_expiration: nil
 
-  def perform(one)
-    [one]
+  def perform(sleepy_time)
+    sleep(sleepy_time)
+    [sleepy_time]
   end
 end

data/lib/sidekiq_unique_jobs/lock/until_and_while_executing.rb

@@ -5,7 +5,7 @@ module SidekiqUniqueJobs
     class UntilAndWhileExecuting < BaseLock
       def execute(callback)
         return unless locked?
-        delete!
+        unlock
 
         runtime_lock.execute(callback) do
           yield if block_given?

data/lib/sidekiq_unique_jobs/lock/until_executed.rb

@@ -10,6 +10,7 @@ module SidekiqUniqueJobs
         using_protection(callback) do
           yield if block_given?
         end
+        unlock
       end
     end
   end

data/lib/sidekiq_unique_jobs/lock/until_executing.rb

@@ -4,7 +4,7 @@ module SidekiqUniqueJobs
   class Lock
     class UntilExecuting < BaseLock
       def execute(callback)
-        delete
+        unlock
         callback.call
         yield if block_given?
       end

data/lib/sidekiq_unique_jobs/lock/while_executing.rb

@@ -18,10 +18,10 @@ module SidekiqUniqueJobs
 
       # Locks the job with the RUN_SUFFIX appended
       def execute(callback)
-        return unless locksmith.lock(item[LOCK_TIMEOUT_KEY])
-
-        using_protection(callback) do
-          yield if block_given?
+        locksmith.lock(item[LOCK_TIMEOUT_KEY]) do
+          using_protection(callback) do
+            yield if block_given?
+          end
         end
       end
 

data/lib/sidekiq_unique_jobs/lock/while_executing_reject.rb

@@ -9,6 +9,8 @@ module SidekiqUniqueJobs
         using_protection(callback) do
           yield if block_given?
         end
+
+        unlock
       end
 
       # Private below here, keeping public due to testing reasons

data/lib/sidekiq_unique_jobs/locksmith.rb

@@ -90,7 +90,8 @@ module SidekiqUniqueJobs
         else
           token = conn.lpop(available_key)
         end
-        yield token if token == jid
+
+        return yield jid if token
       end
     end
 
@@ -101,6 +102,7 @@ module SidekiqUniqueJobs
     def return_token_or_block_value(token)
       return token unless block_given?
 
+      # The reason for begin is to only signal when we have a block
       begin
         yield token
       ensure

data/lib/sidekiq_unique_jobs/sidekiq_unique_ext.rb

@@ -15,14 +15,14 @@ module Sidekiq
       end
 
       def delete_ext
-        SidekiqUniqueJobs::Unlockable.delete(item) if delete_orig
+        SidekiqUniqueJobs::Unlockable.unlock(item) if delete_orig
       end
 
       private
 
       def remove_job_ext
         remove_job_orig do |message|
-          SidekiqUniqueJobs::Unlockable.delete(Sidekiq.load_json(message))
+          SidekiqUniqueJobs::Unlockable.unlock(Sidekiq.load_json(message))
           yield message
         end
       end
@@ -41,7 +41,7 @@ module Sidekiq
       end
 
       def delete_ext
-        SidekiqUniqueJobs::Unlockable.delete(item) if delete_orig
+        SidekiqUniqueJobs::Unlockable.unlock(item) if delete_orig
       end
     end
     include UniqueExtension
@@ -58,7 +58,7 @@ module Sidekiq
 
       def delete_ext
         delete_orig
-        SidekiqUniqueJobs::Unlockable.delete(item)
+        SidekiqUniqueJobs::Unlockable.unlock(item)
       end
     end
 
@@ -105,7 +105,7 @@ module Sidekiq
       end
 
       def delete_by_value_ext(name, value)
-        SidekiqUniqueJobs::Unlockable.delete(Sidekiq.load_json(value)) if delete_by_value_orig(name, value)
+        SidekiqUniqueJobs::Unlockable.unlock(Sidekiq.load_json(value)) if delete_by_value_orig(name, value)
       end
     end
 

data/lib/sidekiq_unique_jobs/timeout.rb

@@ -1,14 +1,7 @@
 # frozen_string_literal: true
 
-require 'timeout'
-
 module SidekiqUniqueJobs
   module Timeout
-    def using_timeout(value)
-      ::Timeout.timeout(value) do
-        yield
-      end
-    end
   end
 end
 

data/lib/sidekiq_unique_jobs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqUniqueJobs
-  VERSION = '6.0.0.rc2'
+  VERSION = '6.0.0.rc3'
 end

data/redis/create.lua

@@ -12,11 +12,7 @@ local api_version   = ARGV[3]
 local concurrency   = tonumber(ARGV[4])
 
 local stored_token  = redis.call('GETSET', exists_key, job_id)
-
-redis.log(redis.LOG_DEBUG, "create.lua - starting...")
-
 if stored_token then
-  redis.log(redis.LOG_DEBUG, "create.lua - stored_token: " .. stored_token)
   return stored_token
 end
 
@@ -24,12 +20,10 @@ end
 -- TODO: Legacy support (Remove in v6.1)
 local old_token  = redis.call('GET', unique_digest)
 if old_token then
-  -- redis.log(redis.LOG_DEBUG, "create.lua - " .. unique_digest .. " with "  .. old_token)
   if old_token == job_id or old_token == '2' then
-    -- redis.log(redis.LOG_DEBUG, "create.lua - " .. unique_digest .. " with "  .. old_token .. " MATCH with " .. job_id)
+    -- No need to return, we just delete the old key
     redis.call('DEL', unique_digest)
   else
-    -- redis.log(redis.LOG_DEBUG, "create.lua - " .. unique_digest .. " with "  .. old_token .. " MISMATCH with " .. job_id)
     return old_token
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-unique-jobs
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc2
+  version: 6.0.0.rc3
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -228,7 +228,6 @@ files:
 - examples/while_executing_reject_job.rb
 - examples/without_argument_job.rb
 - lib/sidekiq-unique-jobs.rb
-- lib/sidekiq/simulator.rb
 - lib/sidekiq_unique_jobs.rb
 - lib/sidekiq_unique_jobs/cli.rb
 - lib/sidekiq_unique_jobs/client/middleware.rb

data/lib/sidekiq/simulator.rb

@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-
-require 'sidekiq/cli'
-require 'sidekiq/launcher'
-
-require 'sidekiq_unique_jobs/timeout'
-
-module Sidekiq
-  class Simulator
-    include SidekiqUniqueJobs::Logging
-    include SidekiqUniqueJobs::Timeout
-
-    attr_reader :queues, :launcher
-
-    def self.process_queue(queue)
-      new(queue).process_queue { yield }
-    end
-
-    def initialize(queue)
-      @queues = Array(queue).uniq
-      @launcher = Sidekiq::Launcher.new(sidekiq_options(queues))
-    end
-
-    def process_queue
-      run_launcher
-      yield
-    ensure
-      terminate_launcher
-    end
-
-    private
-
-    def run_launcher
-      run_launcher!
-    rescue Timeout::Error => exception
-      log_warn('Timeout while starting Sidekiq')
-      log_warn(exception)
-    end
-
-    def run_launcher!
-      using_timeout(15) do
-        launcher.run
-        sleep 0.001 until alive?
-      end
-    end
-
-    def terminate_launcher
-      launcher.stop
-    end
-
-    def alive?
-      launcher.manager.workers.any?
-    end
-
-    def stopped?
-      !alive?
-    end
-
-    def sidekiq_options(queues = [])
-      { queues: queues,
-        concurrency: 3,
-        timeout: 3,
-        verbose: false,
-        logfile: './tmp/sidekiq.log' }
-    end
-  end
-end