unique_job 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01dffe52b964b3fc02be0786f8b7f8ebd8345a02640344a1125a8fc16317ce0c
-  data.tar.gz: 2acd9dcd223fbaac2933f2ddc6c9572d0c259dfb5395b73df83660de12a3e593
+  metadata.gz: 13b17d33adcafb81a0e16d41f3563b9b251b73411d36daa6210c8cc734c97ab5
+  data.tar.gz: cf525feb70cafc0c5a2e07b4b47dcb2280d666bec15e81f0604f34a49f93b5fd
 SHA512:
-  metadata.gz: f03e34e0838f166986a4890519f38dbc6c80f4df8c0034e8a61179775a7b0013f4ab51bb5f54e1651f06e0997017a21da913fcbf9d3a06a90f8570ebcaf6fcb7
-  data.tar.gz: 492759ef2b1b96def0b35e0b2a315ec46b2e5004ed9882728998f741d6f4a10a3dda047413d570caf7e3e5a5acad75f15da7e5b02b48c33099a793888521bfe9
+  metadata.gz: edb0b4aab14acbe9f07f3db3bf178fae140f05cc18b09f22f0d3639d74c45a7462d10e837a4862bee93737404d948e01d6cc8ac4a4c4aa25a579ab2cb30d4a86
+  data.tar.gz: 4e58bc946c6421616ff7397dea2f18a28dd9dcc0855842388a73027fd95168384942366d89acad8385013e431b4e95a026723213efe1e26aca58ef3936027c0d

data/.ruby-version

@@ -1 +1 @@
-2.7.4
+3.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    unique_job (0.4.2)
+    unique_job (0.5.0)
       redis
       sidekiq (> 6.0, < 7.0)
 
@@ -40,4 +40,4 @@ DEPENDENCIES
   unique_job!
 
 BUNDLED WITH
-   2.1.4
+   2.2.22

data/lib/unique_job/client_middleware.rb

@@ -5,7 +5,8 @@ module UniqueJob
     include Util
 
     def initialize(redis_options)
-      @redis_options = redis_options
+      @history = JobHistory.new(self.class.name, Redis.new(redis_options))
+      @context = 'Client'
     end
 
     def call(worker_str, job, queue, redis_pool, &block)
@@ -18,7 +19,7 @@ module UniqueJob
         else
           worker = worker_str.new
         end
-        perform_if_unique(worker, job['args'], &block)
+        perform(worker, job, &block)
       end
     end
   end

data/lib/unique_job/job_history.rb

@@ -2,70 +2,31 @@ require 'unique_job/logging'
 
 module UniqueJob
   class JobHistory
-    def initialize(worker_class, queueing_class, ttl)
-      @key = "#{self.class}:#{queueing_class.name.split('::')[-1]}:#{worker_class}"
-      @ttl = ttl
-    end
-
-    def ttl(val = nil)
-      if val
-        redis.ttl(key(val))
-      else
-        @ttl
-      end
-    end
+    include Logging
 
-    def delete_all
-      redis.keys("#{@key}:*").each do |key|
-        redis.del(key)
-      end
+    def initialize(middleware_name, redis)
+      @key_prefix = "#{self.class}:#{middleware_name.split('::')[-1]}"
+      @redis = redis
     end
 
-    def exists?(val)
-      redis.exists?(key(val))
+    def exists?(v1, v2)
+      @redis.exists?(key(v1, v2))
+    rescue => e
+      logger.warn { "[UniqueJob] Redis#exists? failed v1=#{v1} v2=#{v2} exception=#{e.inspect}" }
+      nil
     end
 
-    def add(val)
-      redis.setex(key(val), @ttl, true)
+    def add(v1, v2, ttl)
+      @redis.setex(key(v1, v2), ttl, true)
+    rescue => e
+      logger.warn { "[UniqueJob] Redis#setex failed v1=#{v1} v2=#{v2} ttl=#{ttl} exception=#{e.inspect}" }
+      nil
     end
 
     private
 
-    def key(val)
-      "#{@key}:#{val}"
-    end
-
-    def redis
-      self.class.redis
-    end
-
-    class << self
-      attr_accessor :redis_options
-
-      def redis
-        @redis ||= Redis.new(redis_options)
-      end
-    end
-
-    module RescueAllRedisErrors
-      include Logging
-
-      %i(
-        ttl
-        exists?
-        add
-      ).each do |method_name|
-        define_method(method_name) do |*args, &blk|
-          start = Time.now
-          super(*args, &blk)
-        rescue => e
-          elapsed = Time.now - start
-          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
-      end
+    def key(v1, v2)
+      "#{@key_prefix}:#{v1}:#{v2}"
     end
-    prepend RescueAllRedisErrors
   end
 end

data/lib/unique_job/server_middleware.rb

@@ -5,11 +5,12 @@ module UniqueJob
     include Util
 
     def initialize(redis_options)
-      @redis_options = redis_options
+      @history = JobHistory.new(self.class.name, Redis.new(redis_options))
+      @context = 'Server'
     end
 
     def call(worker, msg, queue, &block)
-      perform_if_unique(worker, msg['args'], &block)
+      perform(worker, msg, &block)
     end
   end
 end

data/lib/unique_job/util.rb

@@ -5,53 +5,31 @@ module UniqueJob
   module Util
     include Logging
 
-    def perform_if_unique(worker, args, &block)
+    def perform(worker, job, &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}" }
+        key = worker.unique_key(*job['args'])
+        logger.debug { "[UniqueJob] Unique key calculated context=#{@context} worker=#{job['class']} key=#{key}" }
 
-        if check_uniqueness(worker, unique_key)
+        if key.nil? || key.to_s.empty?
+          logger.warn { "[UniqueJob] Skip history check context=#{@context} worker=#{job['class']} key=#{key}" }
           yield
         else
-          logger.debug { "[UniqueJob] Duplicate job skipped worker=#{worker.class} key=#{unique_key}" }
-          perform_callback(worker, :after_skip, args)
-          nil
+          if @history.exists?(job['class'], key)
+            logger.info { "[UniqueJob] Duplicate job skipped context=#{@context} worker=#{job['class']} key=#{key}" }
+            perform_callback(worker, :after_skip, job['args'])
+            nil
+          else
+            logger.debug { "[UniqueJob] Start job context=#{@context} worker=#{job['class']} key=#{key}" }
+            ttl = worker.respond_to?(:unique_in) ? worker.unique_in : 3600
+            @history.add(job['class'], key, ttl)
+            yield
+          end
         end
       else
         yield
       end
     end
 
-    def check_uniqueness(worker, key)
-      if key.nil? || key.to_s.empty?
-        logger.warn { "[UniqueJob] Don't check a job with a blank key worker=#{worker.class} key=#{key}" }
-        return false
-      end
-
-      history = job_history(worker)
-
-      if history.exists?(key)
-        false
-      else
-        history.add(key)
-        true
-      end
-    end
-
-    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
-
-    def truncate(text, length: 100)
-      if text.length > length
-        text.slice(0, length)
-      else
-        text
-      end
-    end
-
     def perform_callback(worker, callback_name, args)
       if worker.respond_to?(callback_name)
         parameters = worker.method(callback_name).parameters

data/lib/unique_job/version.rb

@@ -1,3 +1,3 @@
 module UniqueJob
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unique_job
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - ts-3156
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-26 00:00:00.000000000 Z
+date: 2022-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -78,7 +78,7 @@ metadata:
   homepage_uri: https://github.com/egotter/unique_job
   source_code_uri: https://github.com/egotter/unique_job
   changelog_uri: https://github.com/egotter/unique_job
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -93,8 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Set a uniqueness to Sidekiq jobs
 test_files: []