inst-jobs 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ea5fb9db3338718560d2107fd348ca95077e2b1f98490d33a8f61ecf686d7dd
-  data.tar.gz: 17ae33dac196625a7d194c51b609f1c7e98b6ce8917898b2a03b283b9784c96c
+  metadata.gz: 95bdbd537405c6325f378bed05570a3149053ba8a2e290893010c590df72ea9a
+  data.tar.gz: 6f0d577f1fba37bb01e3e0a4ec05b600e65ebb77d001e29e38b479f6facde73b
 SHA512:
-  metadata.gz: 20ad04cef57908281160729d47e4e9ae0a86b2c75c7200cdb0467c23b69dd32d634b1f6c886cda42209d1a2f794acf2461f0b69f82f4fe8571a999c93b35f277
-  data.tar.gz: 874f268caddfa09f160dd3eb05fa7d9be3d04fb667e23da32d6cce5901d6e45321e203db83830ad4d40986119656453b9e63f3da65f654f302150a4c95286fb6
+  metadata.gz: 38392cab25180d44f40960ffb15b2dd3241bd739980b9d0962b93020a809497bb1a9022caf7a05f4ba40f4cc3792281f03468946c33a1fc62891dec3b411f7cf
+  data.tar.gz: cbea2ab6e762a876994179ac1c9ffd414ea2ec13905931b2cddb087d816664e8b682ecf8f9406726d8f80a0867b8e44bc1331b6e0e73de3415b4ab31090d1ee9

data/db/migrate/20220519204546_add_requeued_job_id_to_failed_jobs.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddRequeuedJobIdToFailedJobs < ActiveRecord::Migration[6.0]
+  def change
+    add_column :failed_jobs, :requeued_job_id, :integer, limit: 8
+  end
+end

data/lib/delayed/backend/active_record.rb

@@ -583,6 +583,21 @@ module Delayed
           def self.cleanup_old_jobs(before_date, batch_size: 10_000)
             where("failed_at < ?", before_date).in_batches(of: batch_size).delete_all
           end
+
+          def requeue!
+            attrs = attributes.except("id", "last_error", "locked_at", "failed_at", "locked_by", "original_job_id",
+                                      "requeued_job_id")
+            self.class.transaction do
+              job = nil
+              Delayed::Worker.lifecycle.run_callbacks(:create, attrs.merge("payload_object" => payload_object)) do
+                job = Job.create(attrs)
+              end
+              self.requeued_job_id = job.id
+              save!
+              JobTracking.job_created(job)
+              job
+            end
+          end
         end
       end
     end

data/lib/delayed/version.rb

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

data/spec/active_record_job_spec.rb

@@ -300,4 +300,27 @@ describe "Delayed::Backed::ActiveRecord::Job" do
       allow(Delayed::Job.connection).to receive(:execute).and_call_original
     end
   end
+
+  context "Failed#requeue!" do
+    it "requeues a failed job" do
+      j = create_job(attempts: 1, max_attempts: 1)
+      fj = j.fail!
+
+      lifecycle_args = nil
+      Delayed::Worker.lifecycle.after(:create) do |args|
+        lifecycle_args = args
+      end
+      j2 = fj.requeue!
+      expect(lifecycle_args["payload_object"].class).to eq SimpleJob
+      expect(fj.reload.requeued_job_id).to eq j2.id
+
+      orig_atts = j.attributes.except("id", "locked_at", "locked_by")
+      new_atts = j2.attributes.except("id", "locked_at", "locked_by")
+      expect(orig_atts).to eq(new_atts)
+
+      # ensure the requeued job actually runs even though `attempts` are maxed out
+      # (so it will not be retried after being manually requeued)
+      expect { run_job(j2) }.to change(SimpleJob, :runs).by(1)
+    end
+  end
 end

data/spec/shared/shared_backend.rb

@@ -82,7 +82,7 @@ shared_examples_for "a backend" do
   it "works with jobs in modules" do
     M::ModuleJob.runs = 0
     job = Delayed::Job.enqueue M::ModuleJob.new
-    expect { job.invoke_job }.to change { M::ModuleJob.runs }.from(0).to(1)
+    expect { job.invoke_job }.to change(M::ModuleJob, :runs).from(0).to(1)
   end
 
   it "raises an DeserializationError when the job class is totally unknown" do

data/spec/shared/worker.rb

@@ -347,7 +347,7 @@ shared_examples_for "Delayed::Worker" do
 
     it "does not run expired jobs" do
       Delayed::Job.enqueue SimpleJob.new, expires_at: Delayed::Job.db_time_now - 1.day
-      expect { @worker.run }.to change(SimpleJob, :runs).by(0)
+      expect { @worker.run }.not_to change(SimpleJob, :runs)
     end
 
     it "reports a permanent failure when an expired job is dequeued" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-12 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -460,6 +460,7 @@ files:
 - db/migrate/20220128084900_update_delete_trigger_for_singleton_unique_constraint_change.rb
 - db/migrate/20220203063200_remove_old_singleton_index.rb
 - db/migrate/20220328152900_add_failed_jobs_indicies.rb
+- db/migrate/20220519204546_add_requeued_job_id_to_failed_jobs.rb
 - exe/inst_jobs
 - lib/delayed/backend/active_record.rb
 - lib/delayed/backend/base.rb