delayed 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 223856c2ccfb73e2f42eed3da86e70b0a819a575028ca1d0ddbebe0fc757c1d6
-  data.tar.gz: b8d496dbd42774fcb7a5528cb4969b15a87cebd2c59899ad8dafa86438279874
+  metadata.gz: 6268c514bb90e5279b8265c4ce21eea8262ac4d539ff161c7f9eab12f15f17ba
+  data.tar.gz: eb0c1f81475163766a680eab603740a4632956fb415e4158430a67bb3998c381
 SHA512:
-  metadata.gz: 5770b2945b0ff2e2a5f80a5cad81c8dd506c41519897e19ad29f973b57250891f3aa31c2d57135f69c960de12ea0724ad4bfa2bc68f445be6699851177a67b5e
-  data.tar.gz: 89dbae3fb440d8cef88ed57131131ca7d3081b8039f772b6d88ebbd09332f7ffa9a2cfe09e5505d5c422ce69b82ae8344bf79d475022aa454594e87ef559e1d6
+  metadata.gz: 73686b95d83b336dcf268f4524fb8b512e64f61b58773b0884e8f1a4c30abc89532aaa0df4e1395d69417d2062ae7e948157c7cd5b3b7cb80982c68dbf798936
+  data.tar.gz: 9f3b7437e5772e0fe44b3f168cd32b78073b6c49b2fc208b713d946d4b48f14549646363856e3d62a7525059a7d841fbe0191a520af3dc06a71e3d258679b68e

data/lib/delayed/priority.rb

@@ -140,6 +140,7 @@ module Delayed
     attr_reader :value
 
     delegate :to_i, to: :value
+    delegate :to_f, to: :value
     delegate :to_s, to: :name
 
     def initialize(value)

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,
@@ -141,17 +142,17 @@ module Delayed
           job.destroy
         end
         job_say job, format('COMPLETED after %.4f seconds', run_time)
-      end
-      true # did work
-    rescue DeserializationError => e
-      job_say job, "FAILED permanently with #{e.class.name}: #{e.message}", 'error'
+        true # did work
+      rescue DeserializationError => e
+        job_say job, "FAILED permanently with #{e.class.name}: #{e.message}", 'error'
 
-      job.error = e
-      failed(job)
-      false # work failed
-    rescue Exception => e # rubocop:disable Lint/RescueException
-      self.class.lifecycle.run_callbacks(:error, self, job) { handle_failed_job(job, e) }
-      false # work failed
+        job.error = e
+        failed(job)
+        false # work failed
+      rescue Exception => e # rubocop:disable Lint/RescueException
+        self.class.lifecycle.run_callbacks(:error, self, job) { handle_failed_job(job, e) }
+        false # work failed
+      end
     end
 
     # Reschedule the job in the future (when a job fails).
@@ -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
 

data/spec/delayed/priority_spec.rb

@@ -207,6 +207,13 @@ RSpec.describe Delayed::Priority do
     expect(described_class.new(101)).to eq described_class.new(101) # rubocop:disable RSpec/IdenticalEqualityAssertion
   end
 
+  it 'supports explicit casting' do
+    expect(described_class.new(0).to_i).to eq 0
+    expect(described_class.new(3).to_f).to eq 3.0
+    expect(described_class.new(10).to_s).to eq 'user_visible'
+    expect(described_class.new(:eventual).to_d).to eq '20'.to_d
+  end
+
   it 'suports coercion' do
     expect(described_class.new(0)).to eq 0
     expect(described_class.new(8)).to be > 5

data/spec/worker_spec.rb

@@ -239,5 +239,35 @@ describe Delayed::Worker do
 
       expect(performances.value).to eq(1)
     end
+
+    it 'wraps perform and cleanup, even when perform raises' do
+      events = []
+      last_error = nil
+
+      plugin = Class.new(Delayed::Plugin) do
+        callbacks do |lifecycle|
+          lifecycle.around(:thread) do |_, &blk|
+            events << :thread_start
+            blk.call
+            events << :thread_end
+          end
+          lifecycle.around(:perform) do |_, job, &blk|
+            events << :perform_start
+            blk.call.tap do
+              last_error = job.last_error
+              events << :perform_end
+            end
+          end
+        end
+      end
+
+      Delayed.plugins << plugin
+
+      Delayed::Job.enqueue ErrorJob.new
+      described_class.new.work_off
+
+      expect(events).to eq %i(thread_start perform_start perform_end thread_end)
+      expect(last_error).to match(/did not work/) # assert that cleanup happened before `:perform_end`
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 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-03 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