inst-jobs 3.1.7 → 3.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0475c3b076cb2d06a380ab5439899071d7b242f0b984efc656c07cdac42a30ef
-  data.tar.gz: 6b327fe5fa9e90ff3e0a9cc6fbbf3bf141fac324999c7b3fe4b86c60196ddab0
+  metadata.gz: 4b84071f5e26623586c13f855f5ce616786a61fa18ebae0a4640cfd48ab2a63c
+  data.tar.gz: c2c386ac0864c1ac08173eb4960ccdf1f7b89184799c59f7d1b427b4330c548d
 SHA512:
-  metadata.gz: fc255ab122c9744ba5222125898d43d12e668d091c5ad7f034693e5ce6d224be21c107caf67261d3bdef03b55f481baa4d0d3912e3c9bff8e1039d8ff12f3f35
-  data.tar.gz: 6a7d73a994637c0241d54da38e98a8c25008345622b9410a867da603740c6eb8133e7bb1d36e8dd62d479148e7bf43bc5e0ea0f1a59f63dd1f0b8a7763467e19
+  metadata.gz: 898a6eb496ec26e653ba3a360cd1e820aaba1a04b3768a265976b5d3ed9150e38795f25fdb1adfb89c69f930ec6bb92d2388e36685685abac0209c1e534e2f36
+  data.tar.gz: 26c8af5d1a05624a0ffd161f8d49fa5c81a205f974849577a0d7fa9c84735c48e0269d7078a038fb2e9865aeae294378b12656c0d5359c3d80bbc31429acf0b7

data/db/migrate/20200330230722_add_id_to_get_delayed_jobs_index.rb

@@ -9,7 +9,8 @@ class AddIdToGetDelayedJobsIndex < ActiveRecord::Migration[4.2]
 
   def up
     rename_index :delayed_jobs, "get_delayed_jobs_index", "get_delayed_jobs_index_old"
-    add_index :delayed_jobs, %i[queue priority run_at id],
+    add_index :delayed_jobs,
+              %i[queue priority run_at id],
               algorithm: :concurrently,
               where: "locked_at IS NULL AND next_in_strand",
               name: "get_delayed_jobs_index"
@@ -18,7 +19,8 @@ class AddIdToGetDelayedJobsIndex < ActiveRecord::Migration[4.2]
 
   def down
     rename_index :delayed_jobs, "get_delayed_jobs_index", "get_delayed_jobs_index_old"
-    add_index :delayed_jobs, %i[priority run_at queue],
+    add_index :delayed_jobs,
+              %i[priority run_at queue],
               algorithm: :concurrently,
               where: "locked_at IS NULL AND next_in_strand",
               name: "get_delayed_jobs_index"

data/db/migrate/20200825011002_add_strand_order_override.rb

@@ -10,7 +10,8 @@ class AddStrandOrderOverride < ActiveRecord::Migration[4.2]
   def up
     add_column :delayed_jobs, :strand_order_override, :integer, default: 0, null: false
     add_column :failed_jobs, :strand_order_override, :integer, default: 0, null: false
-    add_index :delayed_jobs, %i[strand strand_order_override id],
+    add_index :delayed_jobs,
+              %i[strand strand_order_override id],
               algorithm: :concurrently,
               where: "strand IS NOT NULL",
               name: "next_in_strand_index"

data/db/migrate/20210809145804_add_n_strand_index.rb

@@ -4,7 +4,8 @@ class AddNStrandIndex < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 
   def change
-    add_index :delayed_jobs, %i[strand next_in_strand id],
+    add_index :delayed_jobs,
+              %i[strand next_in_strand id],
               name: "n_strand_index",
               where: "strand IS NOT NULL",
               algorithm: :concurrently

data/lib/delayed/backend/active_record.rb

@@ -115,7 +115,7 @@ module Delayed
             # but we don't need to lock when inserting into Delayed::Failed
             if values["strand"] && instance_of?(Job)
               fn_name = connection.quote_table_name("half_md5_as_bigint")
-              quoted_strand = connection.quote(Rails.version < "7.0" ? values["strand"] : values["strand"].value)
+              quoted_strand = connection.quote((Rails.version < "7.0") ? values["strand"] : values["strand"].value)
               sql = "SELECT pg_advisory_xact_lock(#{fn_name}(#{quoted_strand})); #{sql}"
             end
             result = connection.execute(sql, "#{self.class} Create")
@@ -253,7 +253,7 @@ module Delayed
                            offset = 0,
                            query = nil)
           scope = scope_for_flavor(flavor, query)
-          order = flavor.to_s == "future" ? "run_at" : "id desc"
+          order = (flavor.to_s == "future") ? "run_at" : "id desc"
           scope.order(order).limit(limit).offset(offset).to_a
         end
 
@@ -607,7 +607,12 @@ module Delayed
           end
 
           def requeue!
-            attrs = attributes.except("id", "last_error", "locked_at", "failed_at", "locked_by", "original_job_id",
+            attrs = attributes.except("id",
+                                      "last_error",
+                                      "locked_at",
+                                      "failed_at",
+                                      "locked_by",
+                                      "original_job_id",
                                       "requeued_job_id")
             self.class.transaction do
               job = nil

data/lib/delayed/backend/base.rb

@@ -62,6 +62,9 @@ module Delayed
           kwargs[:singleton] = singleton
 
           raise ArgumentError, "Only one of strand or n_strand can be used" if strand && n_strand
+          if (strand || n_strand) && run_at && run_at > Job.db_time_now + Settings.stranded_run_at_grace_period
+            raise ArgumentError, "Do not use run_at with strand; you may inadvertently clog the strand"
+          end
 
           # If two parameters are given to n_strand, the first param is used
           # as the strand name for looking up the Setting, while the second
@@ -113,7 +116,7 @@ module Delayed
         # effectively balancing the load during queueing
         # overwritten in ActiveRecord::Job to use triggers to balance at run time
         def n_strand_options(strand_name, num_strands)
-          strand_num = num_strands > 1 ? rand(num_strands) + 1 : 1
+          strand_num = (num_strands > 1) ? rand(num_strands) + 1 : 1
           strand_name += ":#{strand_num}" if strand_num > 1
           { strand: strand_name }
         end
@@ -214,7 +217,7 @@ module Delayed
       def failed?
         failed_at
       end
-      alias failed failed?
+      alias_method :failed, :failed?
 
       def expired?
         expires_at && (self.class.db_time_now >= expires_at)

data/lib/delayed/cli.rb

@@ -49,7 +49,7 @@ module Delayed
         daemon.daemonize!
         start
       when nil
-        puts option_parser.to_s
+        puts option_parser.help
       else
         raise("Unknown command: #{command.inspect}")
       end
@@ -82,7 +82,8 @@ module Delayed
         opts.on("-c", "--config [CONFIG_PATH]", "Use alternate config file (default #{@options[:config_file]})") do |c|
           @options[:config_file] = c
         end
-        opts.on("-p", "--pid [PID_PATH]",
+        opts.on("-p",
+                "--pid [PID_PATH]",
                 "Use alternate folder for PID files (default #{@options[:pid_folder]})") do |p|
           @options[:pid_folder] = p
         end

data/lib/delayed/lifecycle.rb

@@ -46,7 +46,7 @@ module Delayed
       missing_callback(event) unless @callbacks.key?(event)
 
       unless EVENTS[event].size == args.size
-        raise ArgumentError, "Callback #{event} expects #{EVENTS[event].size} parameter(s): #{EVENTS[event].join(', ')}"
+        raise ArgumentError, "Callback #{event} expects #{EVENTS[event].size} parameter(s): #{EVENTS[event].join(", ")}"
       end
 
       @callbacks[event].execute(*args, &block)

data/lib/delayed/log_tailer.rb

@@ -5,8 +5,8 @@ module Delayed
     def run
       if Rails.logger.respond_to?(:log_path)
         log_path = Rails.logger.log_path
-      elsif Rails.logger.instance_variable_get("@logdev").try(:instance_variable_get, "@dev").try(:path)
-        log_path = Rails.logger.instance_variable_get("@logdev").instance_variable_get("@dev").path
+      elsif Rails.logger.instance_variable_get(:@logdev).try(:instance_variable_get, "@dev").try(:path)
+        log_path = Rails.logger.instance_variable_get(:@logdev).instance_variable_get(:@dev).path
       else
         return
       end

data/lib/delayed/message_sending.rb

@@ -19,7 +19,7 @@ module Delayed
                          @object.protected_methods.exclude?(method) &&
                          @object.private_methods.exclude?(method)
 
-        sender_is_object = @sender == @object
+        sender_is_object = @sender.equal?(@object)
         sender_is_class = @sender.is_a?(@object.class)
 
         # even if the call is async, if the call is _going_ to generate an error, we make it synchronous
@@ -54,8 +54,10 @@ module Delayed
 
           if ::Delayed::Job != ::Delayed::Backend::ActiveRecord::Job || connection != ::Delayed::Job.connection
             connection.after_transaction_commit do
-              ::Delayed::Job.enqueue(::Delayed::PerformableMethod.new(@object, method,
-                                                                      args: args, kwargs: kwargs,
+              ::Delayed::Job.enqueue(::Delayed::PerformableMethod.new(@object,
+                                                                      method,
+                                                                      args: args,
+                                                                      kwargs: kwargs,
                                                                       on_failure: on_failure,
                                                                       on_permanent_failure: on_permanent_failure,
                                                                       sender: @sender),
@@ -65,7 +67,8 @@ module Delayed
           end
         end
 
-        result = ::Delayed::Job.enqueue(::Delayed::PerformableMethod.new(@object, method,
+        result = ::Delayed::Job.enqueue(::Delayed::PerformableMethod.new(@object,
+                                                                         method,
                                                                          args: args,
                                                                          kwargs: kwargs,
                                                                          on_failure: on_failure,

data/lib/delayed/performable_method.rb

@@ -1,7 +1,15 @@
 # frozen_string_literal: true
 
 module Delayed
-  PerformableMethod = Struct.new(:object, :method, :args, :kwargs, :fail_cb, :permanent_fail_cb, :sender) do # rubocop:disable Lint/StructNewOverride
+  PerformableMethod = Struct.new(:object,
+                                 :method, # rubocop:disable Lint/StructNewOverride
+                                 :args,
+                                 :kwargs,
+                                 :fail_cb,
+                                 :permanent_fail_cb,
+                                 :sender,
+                                 :sender_is_object,
+                                 :sender_is_class) do
     def initialize(object, method, args: [], kwargs: {}, on_failure: nil, on_permanent_failure: nil, sender: nil)
       raise NoMethodError, "undefined method `#{method}' for #{object.inspect}" unless object.respond_to?(method, true)
 
@@ -11,13 +19,8 @@ module Delayed
       self.method = method.to_sym
       self.fail_cb           = on_failure
       self.permanent_fail_cb = on_permanent_failure
-      self.sender = sender
-      begin
-        YAML.load(YAML.dump(sender))
-      rescue
-        # if for some reason you can't dump the sender, just drop it
-        self.sender = nil
-      end
+      self.sender_is_object = sender.equal?(object)
+      self.sender_is_class = sender.is_a?(object.class)
     end
 
     def display_name
@@ -32,14 +35,15 @@ module Delayed
     def perform
       kwargs = self.kwargs || {}
 
-      sender_is_object = sender == object
-      sender_is_class = sender.is_a?(object.class)
+      # back-compat for jobs queued before we assigned these in initialize
+      self.sender_is_object = sender.equal?(object) if sender_is_object.nil?
+      self.sender_is_class = sender.is_a?(object.class) if sender_is_class.nil?
 
-      if sender.nil? || sender_is_object || (sender_is_class && object.protected_methods.include?(method))
+      if sender_is_object || (sender_is_class && object.protected_methods.include?(method))
         if kwargs.empty?
-          object.send(method, *args)
+          object.__send__(method, *args)
         else
-          object.send(method, *args, **kwargs)
+          object.__send__(method, *args, **kwargs)
         end
       elsif kwargs.empty?
         object.public_send(method, *args)
@@ -59,9 +63,9 @@ module Delayed
     def deep_de_ar_ize(arg)
       case arg
       when Hash
-        "{#{arg.map { |k, v| "#{deep_de_ar_ize(k)} => #{deep_de_ar_ize(v)}" }.join(', ')}}"
+        "{#{arg.map { |k, v| "#{deep_de_ar_ize(k)} => #{deep_de_ar_ize(v)}" }.join(", ")}}"
       when Array
-        "[#{arg.map { |a| deep_de_ar_ize(a) }.join(', ')}]"
+        "[#{arg.map { |a| deep_de_ar_ize(a) }.join(", ")}]"
       when ActiveRecord::Base
         "#{arg.class}.find(#{arg.id})"
       else
@@ -73,7 +77,7 @@ module Delayed
       obj_name = object.is_a?(ActiveRecord::Base) ? "#{object.class}.find(#{object.id}).#{method}" : display_name
       kgs = kwargs || {}
       kwargs_str = kgs.map { |(k, v)| ", #{k}: #{deep_de_ar_ize(v)}" }.join
-      "#{obj_name}(#{args.map { |a| deep_de_ar_ize(a) }.join(', ')}#{kwargs_str})"
+      "#{obj_name}(#{args.map { |a| deep_de_ar_ize(a) }.join(", ")}#{kwargs_str})"
     end
   end
 end

data/lib/delayed/periodic.rb

@@ -83,7 +83,7 @@ module Delayed
     def tag
       "periodic: #{@name}"
     end
-    alias display_name tag
+    alias_method :display_name, :tag
 
     def self.now
       Time.zone.now

data/lib/delayed/settings.rb

@@ -26,6 +26,7 @@ module Delayed
       :sleep_delay,
       :sleep_delay_stagger,
       :slow_exit_timeout,
+      :stranded_run_at_grace_period,
       :worker_health_check_type,
       :worker_health_check_config,
       :worker_procname_prefix
@@ -132,6 +133,7 @@ module Delayed
     self.fetch_batch_size = 5
     self.select_random_from_batch = false
     self.silence_periodic_log = false
+    self.stranded_run_at_grace_period = 10
 
     self.num_strands = ->(_strand_name) {}
     self.default_job_options = -> { {} }

data/lib/delayed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delayed
-  VERSION = "3.1.7"
+  VERSION = "3.1.9"
 end

data/lib/delayed/work_queue/parent_process/server.rb

@@ -163,7 +163,7 @@ module Delayed
                 forced_latency: forced_latency
               )
               logger.debug(
-                "Fetched and locked #{response.values.flatten.size} new jobs for workers (#{response.keys.join(', ')})."
+                "Fetched and locked #{response.values.flatten.size} new jobs for workers (#{response.keys.join(", ")})."
               )
               response.each do |(worker_name, locked_jobs)|
                 if worker_name == prefetch_owner
@@ -267,7 +267,7 @@ module Delayed
         end
 
         def prefetch_owner
-          "prefetch:#{Socket.gethostname rescue 'X'}"
+          "prefetch:#{Socket.gethostname rescue "X"}"
         end
 
         def parent_exited?

data/lib/delayed/worker/process_helper.rb

@@ -9,9 +9,9 @@ module Delayed
       ALIVE_CHECK_LINUX = '[ -d "/proc/$WORKER_PID" ]'
       ALIVE_CHECK_MAC = "ps -p $WORKER_PID > /dev/null"
       ALIVE_CHECK = RUBY_PLATFORM.include?("darwin") ? ALIVE_CHECK_MAC : ALIVE_CHECK_LINUX
-      SCRIPT_TEMPLATE = <<-BASH
-        WORKER_PID="%<pid>d" # an example, filled from ruby when the check is created
-        ORIGINAL_MTIME="%<mtime>s" # an example, filled from ruby when the check is created
+      SCRIPT_TEMPLATE = <<~SH
+        WORKER_PID="%{pid}" # an example, filled from ruby when the check is created
+        ORIGINAL_MTIME="%{mtime}" # an example, filled from ruby when the check is created
 
         if #{ALIVE_CHECK}; then
             CURRENT_MTIME=$(#{STAT})
@@ -26,7 +26,7 @@ module Delayed
         else
             exit 255 # The process is no more, trigger a "critical" state.
         fi
-      BASH
+      SH
 
       def self.mtime(pid)
         if RUBY_PLATFORM.include?("darwin")

data/lib/delayed/worker.rb

@@ -77,7 +77,7 @@ module Delayed
     end
 
     def name
-      @name ||= "#{Socket.gethostname rescue 'X'}:#{id}"
+      @name ||= "#{Socket.gethostname rescue "X"}:#{id}"
     end
 
     def process_name=(new_name)
@@ -100,7 +100,7 @@ module Delayed
     def start
       logger.info "Starting worker"
       self.process_name =
-        "start:#{Settings.worker_procname_prefix}#{@queue_name}:#{min_priority || 0}:#{max_priority || 'max'}"
+        "start:#{Settings.worker_procname_prefix}#{@queue_name}:#{min_priority || 0}:#{max_priority || "max"}"
       @self_pipe = IO.pipe
       work_queue.init
 
@@ -170,7 +170,7 @@ module Delayed
 
       self.class.lifecycle.run_callbacks(:loop, self) do
         self.process_name =
-          "pop:#{Settings.worker_procname_prefix}#{@queue_name}:#{min_priority || 0}:#{max_priority || 'max'}"
+          "pop:#{Settings.worker_procname_prefix}#{@queue_name}:#{min_priority || 0}:#{max_priority || "max"}"
         job = self.class.lifecycle.run_callbacks(:pop, self) do
           work_queue.get_and_lock_next_available(name, config)
         end
@@ -196,7 +196,7 @@ module Delayed
           end
         else
           self.process_name =
-            "wait:#{Settings.worker_procname_prefix}#{@queue_name}:#{min_priority || 0}:#{max_priority || 'max'}"
+            "wait:#{Settings.worker_procname_prefix}#{@queue_name}:#{min_priority || 0}:#{max_priority || "max"}"
           sleep(Settings.sleep_delay + (rand * Settings.sleep_delay_stagger)) unless exit?
         end
       end
@@ -220,7 +220,7 @@ module Delayed
             end
             job.destroy
           end
-          logger.info("Completed #{log_job(job, :short)} #{format('%.0fms', (runtime * 1000))}")
+          logger.info("Completed #{log_job(job, :short)} #{format("%.0fms", (runtime * 1000))}")
         end
       rescue ::Delayed::RetriableError => e
         can_retry = job.attempts + 1 < job.inferred_max_attempts
@@ -279,7 +279,7 @@ module Delayed
       previous_tmpdir = ENV.fetch("TMPDIR", nil)
 
       self.class.running_job(job) do
-        dir = Dir.mktmpdir("job-#{job.id}-#{name.gsub(/[^\w.]/, '.')}-")
+        dir = Dir.mktmpdir("job-#{job.id}-#{name.gsub(/[^\w.]/, ".")}-")
         begin
           ENV["TMPDIR"] = dir
           yield

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 3.1.7
+  version: 3.1.9
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-13 00:00:00.000000000 Z
+date: 2023-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -285,33 +285,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.10'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-inst
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement