delayed 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 223856c2ccfb73e2f42eed3da86e70b0a819a575028ca1d0ddbebe0fc757c1d6
-  data.tar.gz: b8d496dbd42774fcb7a5528cb4969b15a87cebd2c59899ad8dafa86438279874
+  metadata.gz: ea752ae23dd7aee646bcd0be946a7e414c328c4323dc4a2f34d0ee2106c36364
+  data.tar.gz: 6b2509d426b6e7dd25340fde6a3ff4ccfea88fbf15d53d91a1724629ff21c170
 SHA512:
-  metadata.gz: 5770b2945b0ff2e2a5f80a5cad81c8dd506c41519897e19ad29f973b57250891f3aa31c2d57135f69c960de12ea0724ad4bfa2bc68f445be6699851177a67b5e
-  data.tar.gz: 89dbae3fb440d8cef88ed57131131ca7d3081b8039f772b6d88ebbd09332f7ffa9a2cfe09e5505d5c422ce69b82ae8344bf79d475022aa454594e87ef559e1d6
+  metadata.gz: 015dd62d37946fd70411776f89a6d96850b76a1f3d54a280d38ff82d816b0ab0532b673309ace4882575b443a9ce1244e8a053a82d25413d2217213d3c72284f
+  data.tar.gz: 5dcd12088fb0bbe76abe2559a35aa53a6b90155fe22dd992033b31f12f63b0d572ec8ba2b87d2ad418837dc25ebaeecd1a558108e8cf74f08081c11435ddcafb

data/lib/delayed/worker.rb

@@ -101,7 +101,12 @@ module Delayed
         pool = Concurrent::FixedThreadPool.new(jobs.length)
         jobs.each do |job|
           pool.post do
-            success.increment if run_job(job)
+            self.class.lifecycle.run_callbacks(:thread, self, job) do
+              success.increment if perform(job)
+            end
+          rescue Exception => e # rubocop:disable Lint/RescueException
+            job_say job, "Job thread crashed with #{e.class.name}: #{e.message}", 'error'
+            job.error = e
           end
         end
 
@@ -117,12 +122,8 @@ module Delayed
       [success.value, total - success.value]
     end
 
-    def run_thread_callbacks(job, &block)
-      self.class.lifecycle.run_callbacks(:thread, self, job, &block)
-    end
-
-    def run(job)
-      run_thread_callbacks(job) do
+    def perform(job)
+      self.class.lifecycle.run_callbacks(:perform, self, job) do
         metadata = {
           status: 'RUNNING',
           name: job.name,
@@ -209,10 +210,6 @@ module Delayed
       reschedule(job)
     end
 
-    def run_job(job)
-      self.class.lifecycle.run_callbacks(:perform, self, job) { run(job) }
-    end
-
     # The backend adapter may return either a list or a single job
     # In some backends, this can be controlled with the `max_claims` config
     # Either way, we map this to an array of job instances

data/lib/delayed.rb

@@ -42,8 +42,8 @@ module Delayed
   mattr_accessor(:default_log_level) { 'info'.freeze }
   mattr_accessor(:plugins) do
     [
-      Delayed::Plugins::Instrumentation,
       Delayed::Plugins::Connection,
+      Delayed::Plugins::Instrumentation,
     ]
   end
 

data/spec/delayed/job_spec.rb

@@ -533,7 +533,7 @@ describe Delayed::Job do
       it 'fails after Worker.max_run_time' do
         Delayed::Worker.max_run_time = 1.second
         job = described_class.create payload_object: LongRunningJob.new
-        worker.run(job)
+        worker.perform(job)
         expect(job.error).not_to be_nil
         expect(job.reload.last_error).to match(/expired/)
         expect(job.reload.last_error).to match(/Delayed::Worker\.max_run_time is only 1 second/)
@@ -558,7 +558,7 @@ describe Delayed::Job do
 
       it 'records last_error when destroy_failed_jobs = false, max_attempts = 1' do
         Delayed::Worker.max_attempts = 1
-        worker.run(@job)
+        worker.perform(@job)
         @job.reload
         expect(@job.error).not_to be_nil
         expect(@job.last_error).to match(/did not work/)
@@ -580,7 +580,7 @@ describe Delayed::Job do
 
       it 're-schedules jobs with handler provided time if present' do
         job = described_class.enqueue(CustomRescheduleJob.new(99.minutes))
-        worker.run(job)
+        worker.perform(job)
         job.reload
 
         expect((described_class.db_time_now + 99.minutes - job.run_at).abs).to be < 1
@@ -590,7 +590,7 @@ describe Delayed::Job do
         error_with_nil_message = StandardError.new
         expect(error_with_nil_message).to receive(:message).twice.and_return(nil)
         expect(@job).to receive(:invoke_job).and_raise error_with_nil_message
-        expect { worker.run(@job) }.not_to raise_error
+        expect { worker.perform(@job) }.not_to raise_error
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Nathan Griffith
@@ -18,7 +18,7 @@ authors:
 - Tobias Lütke
 bindir: bin
 cert_chain: []
-date: 2025-01-24 00:00:00.000000000 Z
+date: 2025-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.6
 specification_version: 4
 summary: a multi-threaded, SQL-driven ActiveJob backend used at Betterment to process
   millions of background jobs per day