chained_job 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cf0d92c19a3955df5206dc54e7ca3883120a73fdcc1fd8743495f9c37690308
-  data.tar.gz: '09617e3e0873985b586da6903f604e89f1d429bab84bf99e88d652d807408d08'
+  metadata.gz: 21a653ae3a0eaaf596d741a3208b4aee1a7d297700e1d506c7005bf7cd529618
+  data.tar.gz: 03ab75c95d0610a9f192d3f6f7bfc7eeac516f641b4bbc32730ac45d1710f3bc
 SHA512:
-  metadata.gz: 37ca1b1aa5dc58b495a0dac015b024919713ecf4a6ccfc63b252f81f1adfb9090b702e6175f3f9aaa5da85a0293e043e398226a67c684138bffceb28c819db63
-  data.tar.gz: dbe7e4ce4dd1c92f955e62f0e0cf806df9a580fa54658960ee9889c92adb02eb30f8de3b61c57b9e652a1fff1167f86cb8c0caf613e43ca2ac07fc7b77bf2dfb
+  metadata.gz: fb6be468a09e6824fb2dd21fd8aa8029790a63c145d9f5048b5c29dea2632e85e6b6ebcfb29558e7504982a4ad48261140e6b96b3b8e4ef55726d58a18ed58c0
+  data.tar.gz: 75a1aefe58b764b69d05514bfa47209ec4ff9d3f743379301841d132e15fc60c34f6254e0fae7dfacbca393c973f4ad2809dffcfb5a7041a42e62d3155a95857

data/lib/chained_job/clean_up_queue.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'chained_job/helpers'
+
+module ChainedJob
+  class CleanUpQueue
+    def self.run(job_class)
+      new(job_class).run
+    end
+
+    TRIM_STEP_SIZE = 1_000
+
+    attr_reader :job_class
+
+    def initialize(job_class)
+      @job_class = job_class
+    end
+
+    # rubocop:disable Metrics/AbcSize
+    def run
+      loop do
+        tag = ChainedJob.redis.spop(tag_list)
+
+        break unless tag
+
+        redis_key = Helpers.redis_key(job_key, tag)
+        size = ChainedJob.redis.llen(redis_key)
+        (size / TRIM_STEP_SIZE).times { ChainedJob.redis.ltrim(redis_key, 0, -TRIM_STEP_SIZE) }
+
+        ChainedJob.redis.del(redis_key)
+      end
+    end
+    # rubocop:enable Metrics/AbcSize
+
+    private
+
+    def tag_list
+      @tag_list ||= Helpers.tag_list(job_key)
+    end
+
+    def job_key
+      @job_key ||= Helpers.job_key(job_class)
+    end
+  end
+end

data/lib/chained_job/config.rb

@@ -15,6 +15,7 @@ module ChainedJob
       :debug,
       :logger,
       :redis,
+      :queue,
     )
 
     def initialize

data/lib/chained_job/helpers.rb

@@ -4,8 +4,16 @@ module ChainedJob
   module Helpers
     module_function
 
-    def redis_key(job_class)
+    def job_key(job_class)
       "chained_job:#{job_class}"
     end
+
+    def redis_key(job_key, tag)
+      "#{job_key}:#{tag}"
+    end
+
+    def tag_list(prefix)
+      "#{prefix}:tags"
+    end
   end
 end

data/lib/chained_job/middleware.rb

@@ -5,9 +5,13 @@ require 'chained_job/process'
 
 module ChainedJob
   module Middleware
-    def perform(worker_id = nil)
+    def self.included(base)
+      base.queue_as ChainedJob.config.queue if ChainedJob.config.queue
+    end
+
+    def perform(worker_id = nil, tag = nil)
       if worker_id
-        ChainedJob::Process.run(self, worker_id)
+        ChainedJob::Process.run(self, worker_id, tag)
       else
         ChainedJob::StartChains.run(self.class, array_of_job_arguments, parallelism)
       end

data/lib/chained_job/process.rb

@@ -4,15 +4,16 @@ require 'chained_job/helpers'
 
 module ChainedJob
   class Process
-    def self.run(job_instance, worker_id)
-      new(job_instance, worker_id).run
+    def self.run(job_instance, worker_id, job_tag)
+      new(job_instance, worker_id, job_tag).run
     end
 
-    attr_reader :job_instance, :worker_id
+    attr_reader :job_instance, :worker_id, :job_tag
 
-    def initialize(job_instance, worker_id)
+    def initialize(job_instance, worker_id, job_tag)
       @job_instance = job_instance
       @worker_id = worker_id
+      @job_tag = job_tag
     end
 
     def run
@@ -20,7 +21,7 @@ module ChainedJob
         return log_finished_worker unless argument
 
         job_instance.process(argument)
-        job_instance.class.perform_later(worker_id)
+        job_instance.class.perform_later(worker_id, job_tag)
       end
     end
 
@@ -36,7 +37,7 @@ module ChainedJob
 
     def log_finished_worker
       ChainedJob.logger.info(
-        "#{job_instance.class} worker #{worker_id} finished"
+        "#{job_instance.class}:#{job_tag} worker #{worker_id} finished"
       )
     end
 
@@ -45,7 +46,11 @@ module ChainedJob
     end
 
     def redis_key
-      Helpers.redis_key(job_instance.class)
+      Helpers.redis_key(job_key, job_tag)
+    end
+
+    def job_key
+      Helpers.job_key(job_instance.class)
     end
   end
 end

data/lib/chained_job/start_chains.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'chained_job/helpers'
+require 'chained_job/clean_up_queue'
+require 'chained_job/store_job_arguments'
 
 module ChainedJob
   class StartChains
@@ -16,19 +18,21 @@ module ChainedJob
       @parallelism = parallelism
     end
 
+    # rubocop:disable Metrics/AbcSize
     def run
       with_hooks do
-        redis.del(redis_key)
+        ChainedJob::CleanUpQueue.run(job_class)
 
         next unless array_of_job_arguments.count.positive?
 
-        store_job_arguments
+        ChainedJob::StoreJobArguments.run(job_class, job_tag, array_of_job_arguments)
 
         log_chained_job_start
 
-        parallelism.times { |worked_id| job_class.perform_later(worked_id) }
+        parallelism.times { |worked_id| job_class.perform_later(worked_id, job_tag) }
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     private
 
@@ -44,31 +48,15 @@ module ChainedJob
       }
     end
 
-    def store_job_arguments
-      array_of_job_arguments.each_slice(config.arguments_batch_size) do |sublist|
-        redis.rpush(redis_key, sublist)
-      end
-
-      redis.expire(redis_key, config.arguments_queue_expiration)
+    def job_tag
+      @job_tag ||= Time.now.to_f.to_s
     end
 
     def log_chained_job_start
       ChainedJob.logger.info(
-        "#{job_class} starting #{parallelism} workers "\
+        "#{job_class}:#{job_tag} starting #{parallelism} workers "\
         "processing #{array_of_job_arguments.count} items"
       )
     end
-
-    def redis
-      ChainedJob.redis
-    end
-
-    def redis_key
-      Helpers.redis_key(job_class)
-    end
-
-    def config
-      ChainedJob.config
-    end
   end
 end

data/lib/chained_job/store_job_arguments.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'chained_job/helpers'
+
+module ChainedJob
+  class StoreJobArguments
+    def self.run(job_class, job_tag, array_of_job_arguments)
+      new(job_class, job_tag, array_of_job_arguments).run
+    end
+
+    attr_reader :job_class, :job_tag, :array_of_job_arguments
+
+    def initialize(job_class, job_tag, array_of_job_arguments)
+      @job_class = job_class
+      @job_tag = job_tag
+      @array_of_job_arguments = array_of_job_arguments
+    end
+
+    def run
+      set_tag_list
+
+      array_of_job_arguments.each_slice(config.arguments_batch_size) do |sublist|
+        ChainedJob.redis.rpush(redis_key, sublist)
+      end
+
+      ChainedJob.redis.expire(redis_key, config.arguments_queue_expiration)
+    end
+
+    private
+
+    def set_tag_list
+      ChainedJob.redis.sadd(tag_list, job_tag)
+    end
+
+    def tag_list
+      Helpers.tag_list(job_key)
+    end
+
+    def redis_key
+      @redis_key ||= Helpers.redis_key(job_key, job_tag)
+    end
+
+    def job_key
+      @job_key ||= Helpers.job_key(job_class)
+    end
+
+    def config
+      ChainedJob.config
+    end
+  end
+end

data/lib/chained_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ChainedJob
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chained_job
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Mantas Kūjalis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,11 +77,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/chained_job.rb
+- lib/chained_job/clean_up_queue.rb
 - lib/chained_job/config.rb
 - lib/chained_job/helpers.rb
 - lib/chained_job/middleware.rb
 - lib/chained_job/process.rb
 - lib/chained_job/start_chains.rb
+- lib/chained_job/store_job_arguments.rb
 - lib/chained_job/version.rb
 homepage: https://github.com/vinted/chained_job
 licenses: