inst-jobs 3.1.7 → 3.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0475c3b076cb2d06a380ab5439899071d7b242f0b984efc656c07cdac42a30ef
-  data.tar.gz: 6b327fe5fa9e90ff3e0a9cc6fbbf3bf141fac324999c7b3fe4b86c60196ddab0
+  metadata.gz: 4ecc79cbf0af3c0205febacfb4124bf1b86183132fd28f1330b0fb9c097efe62
+  data.tar.gz: 31f7cb19c7ecc6b71833dcc31b998642fec44e06d1bfbaefc2ed868fe331688a
 SHA512:
-  metadata.gz: fc255ab122c9744ba5222125898d43d12e668d091c5ad7f034693e5ce6d224be21c107caf67261d3bdef03b55f481baa4d0d3912e3c9bff8e1039d8ff12f3f35
-  data.tar.gz: 6a7d73a994637c0241d54da38e98a8c25008345622b9410a867da603740c6eb8133e7bb1d36e8dd62d479148e7bf43bc5e0ea0f1a59f63dd1f0b8a7763467e19
+  metadata.gz: 1d76db82af500258ac736d6b3819fffcccc0afe81a4c44cf01c540252695f3a3b2d120c00576f4ee02459e0808ddcb1d19c25ddb16c41945fc103718fa8011e3
+  data.tar.gz: 6f6efc00e1a707f5e984455db881281f56eac2b06fd17ee75a5a574c883fcdcb7c99b1483d3d3cadb6d501d6ee4c98b031b997e285bdf598bbc257cf6fb83364

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

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 == 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)

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.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 3.1.7
+  version: 3.1.8
 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-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord