unique_job 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a0a010e61296a6a1fdf584470177a01db0325a899ee6a6cae9e683b6a498b5c
-  data.tar.gz: 077e870580c431a04c1c73797b8cf4fe8364289f3a11c4d15788045f65f069be
+  metadata.gz: 13b17d33adcafb81a0e16d41f3563b9b251b73411d36daa6210c8cc734c97ab5
+  data.tar.gz: cf525feb70cafc0c5a2e07b4b47dcb2280d666bec15e81f0604f34a49f93b5fd
 SHA512:
-  metadata.gz: 9cca947e010dec20bf88146f014caa1021091034ce1709e4e1f60db189da51aefc198a3fb53bde6d1be4206271576fe87ef012f7d6533f9f272ee3755b0585fc
-  data.tar.gz: ce2b3b6191f93fee6dcaaf9ddeac62750d4d3cbb1218a6540fd47367ce74dea0370a05793d61840c645f9e4377f978f091f2a558f8f2fb4434985f449ecb3b74
+  metadata.gz: edb0b4aab14acbe9f07f3db3bf178fae140f05cc18b09f22f0d3639d74c45a7462d10e837a4862bee93737404d948e01d6cc8ac4a4c4aa25a579ab2cb30d4a86
+  data.tar.gz: 4e58bc946c6421616ff7397dea2f18a28dd9dcc0855842388a73027fd95168384942366d89acad8385013e431b4e95a026723213efe1e26aca58ef3936027c0d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    unique_job (0.4.4)
+    unique_job (0.5.0)
       redis
       sidekiq (> 6.0, < 7.0)
 

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)

data/lib/unique_job/job_history.rb

@@ -2,77 +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
-
-      MX = Mutex.new
-
-      def redis
-        MX.synchronize do
-          unless @redis
-            @redis = Redis.new(redis_options)
-          end
-        end
-        @redis
-      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,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 = 'Server'
     end
 
     def call(worker, msg, queue, &block)

data/lib/unique_job/util.rb

@@ -7,44 +7,29 @@ module UniqueJob
 
     def perform(worker, job, &block)
       if worker.respond_to?(:unique_key)
-        unique_key = worker.unique_key(*job['args'])
-        logger.debug { "[UniqueJob] Unique key calculated worker=#{job['class']} key=#{unique_key}" }
+        key = worker.unique_key(*job['args'])
+        logger.debug { "[UniqueJob] Unique key calculated context=#{@context} worker=#{job['class']} key=#{key}" }
 
-        if unique?(worker, unique_key)
-        elsif unique?(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=#{job['class']} key=#{unique_key}" }
-          perform_callback(worker, :after_skip, job['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 unique?(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 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.4"
+  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.4
+  version: 0.5.0
 platform: ruby
 authors:
 - ts-3156
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-14 00:00:00.000000000 Z
+date: 2022-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq