unique_job 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b243c0d4dea6a7399aa0a41dd0f2164e60de12db4b964b49df4a1964c4ae35fc
-  data.tar.gz: 2a29407adb437d8cf3111aed035a2da17bb6da1147d086ad5d039a1880629fe2
+  metadata.gz: 4cbff20f17ded63e7824299a196e4b46da0314658cfdebfb79566847905e7720
+  data.tar.gz: 1c7778662c1ab6f3e2e00ed4dec04886bc72159f09ec3a3e9a244168e19802f7
 SHA512:
-  metadata.gz: 96526b267c18a5894593092aad3c9c455b657e3e81b251a8f55c77ec0c1f4034cc05f05797e0491c4ccaf51f985b1fb2b504af8dbe82a5a60d323905b4e63586
-  data.tar.gz: 653dba5f3c033debbd67e68d7aa3a79c15b0ca03c7488cc6113edfbff57c3199e7abdfa669fc932519fcc636a16174b03c109663674b16f4efd7d37569f567ca
+  metadata.gz: 5ac698df69e9a40d980066ce2d37bc58af82da710ba82b7c91a99a7965651c1ea5b717c410b34e8bc0d6668543172814a63fcd714609d34eb39bfb44497da8d9
+  data.tar.gz: 9acb300b369ada327e4946af6bb4f1c11e2a23398e75209427310a8478ee8c7844ce56e805256ccafe93e6b5dedce33c0cfdc74bfce15a2fef3839223cb7f328

data/.ruby-version

@@ -0,0 +1 @@
+2.7.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    unique_job (0.2.1)
+    unique_job (0.4.0)
       redis
       sidekiq (> 6.0, < 7.0)
 
@@ -9,17 +9,14 @@ GEM
   remote: https://rubygems.org/
   specs:
     connection_pool (2.2.3)
-    minitest (5.11.3)
-    rack (2.2.2)
-    rack-protection (2.0.8.1)
-      rack
-    rake (12.3.2)
-    redis (4.2.1)
-    sidekiq (6.0.7)
+    minitest (5.14.2)
+    rack (2.2.3)
+    rake (12.3.3)
+    redis (4.2.2)
+    sidekiq (6.1.2)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
-      rack-protection (>= 2.0.0)
-      redis (>= 4.1.0)
+      redis (>= 4.2.0)
 
 PLATFORMS
   ruby

data/lib/unique_job/client_middleware.rb

@@ -4,6 +4,10 @@ module UniqueJob
   class ClientMiddleware
     include Util
 
+    def initialize(redis_options)
+      @redis_options = redis_options
+    end
+
     def call(worker_str, job, queue, redis_pool, &block)
       if job.has_key?('at')
         # perform_in or perform_at

data/lib/unique_job/job_history.rb

@@ -40,8 +40,10 @@ module UniqueJob
     end
 
     class << self
+      attr_accessor :redis_options
+
       def redis
-        @redis ||= Redis.client(ENV['REDIS_HOST'])
+        @redis ||= Redis.new(redis_options)
       end
     end
 
@@ -58,7 +60,7 @@ module UniqueJob
           super(*args, &blk)
         rescue => e
           elapsed = Time.now - start
-          logger.warn "Rescue all errors in #{self.class}##{method_name} #{e.inspect} elapsed=#{sprintf("%.3f sec", elapsed)}"
+          logger.warn "[UniqueJob] Rescue all errors in #{self.class}##{method_name} #{e.inspect} elapsed=#{sprintf("%.3f sec", elapsed)}"
           logger.debug { e.backtrace.join("\n") }
           nil
         end

data/lib/unique_job/server_middleware.rb

@@ -4,6 +4,10 @@ module UniqueJob
   class ServerMiddleware
     include Util
 
+    def initialize(redis_options)
+      @redis_options = redis_options
+    end
+
     def call(worker, msg, queue, &block)
       perform_if_unique(worker, msg['args'], &block)
     end

data/lib/unique_job/util.rb

@@ -8,26 +8,27 @@ module UniqueJob
     def perform_if_unique(worker, args, &block)
       if worker.respond_to?(:unique_key)
         unique_key = worker.unique_key(*args)
+        logger.debug { "[UniqueJob] Calculate unique key worker=#{worker.class} key=#{unique_key}" }
 
         if unique_key.nil? || unique_key.to_s.empty?
-          logger.warn { "#{self.class}##{__method__} Key is blank worker=#{worker.class} args=#{truncate(args.inspect)}" }
+          logger.warn { "[UniqueJob] Don't check a job with a blank key worker=#{worker.class} key=#{unique_key}" }
           yield
-        elsif perform_unique_check(worker, args, unique_key.to_s)
+        elsif check_uniqueness(worker, unique_key.to_s)
           yield
+        else
+          logger.debug { "[UniqueJob] Duplicate job skipped worker=#{worker.class} key=#{unique_key}" }
+          perform_callback(worker, :after_skip, args)
+          nil
         end
       else
         yield
       end
     end
 
-    def perform_unique_check(worker, args, unique_key)
+    def check_uniqueness(worker, unique_key)
       history = job_history(worker)
 
       if history.exists?(unique_key)
-        logger.info { "#{self.class}##{__method__} Skip duplicate job for #{history.ttl} seconds, remaining #{history.ttl(unique_key)} seconds worker=#{worker.class} args=#{truncate(args.inspect)} key=#{unique_key}" }
-
-        perform_callback(worker, :after_skip, args)
-
         false
       else
         history.add(unique_key)
@@ -37,6 +38,7 @@ module UniqueJob
 
     def job_history(worker)
       ttl = worker.respond_to?(:unique_in) ? worker.unique_in : 3600
+      JobHistory.redis_options = @redis_options
       JobHistory.new(worker.class, self.class, ttl)
     end
 
@@ -59,8 +61,7 @@ module UniqueJob
             worker.send(callback_name, *args)
           end
         rescue ArgumentError => e
-          message = "The number of parameters of the callback method (#{parameters.size}) is not the same as the number of arguments (#{args.size})"
-          raise ArgumentError.new("#{self.class}:#{worker.class} #{message} callback_name=#{callback_name} args=#{args.inspect} parameters=#{parameters.inspect}")
+          raise ArgumentError.new("[UniqueJob] Invalid parameters callback=#{callback_name}")
         end
       end
     end

data/lib/unique_job/version.rb

@@ -1,3 +1,3 @@
 module UniqueJob
-  VERSION = "0.2.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unique_job
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - ts-3156
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2021-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -52,6 +52,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -91,8 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Set a uniqueness to Sidekiq jobs