queue_classic_plus 4.0.0.alpha19 → 4.0.0.alpha21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ded39f47849c6dacb9e4efe8bc535bf9fae56cf15cc366cdde177e12176ae37
-  data.tar.gz: 228a9d4ed7b5a4541e1d93e9887c3f3ec9193e9464c9766817ffd1690530d864
+  metadata.gz: d61507724f9d6b55e0cb83626e9cebd28e41d30f950c6fb30d16d38b762ff411
+  data.tar.gz: 4661d1689861baf7658ee403bba56551a0a8830932c604a550b07e3f2c8e5e57
 SHA512:
-  metadata.gz: 447ed6984427a1649f76ed733c2eafcf6324a5591265cd3f3ec9d29ca8f09552c2a93134b3a481ab06fd1d64b1f78db405fd4ade10e1b372eb62b6e8cbdfe364
-  data.tar.gz: c4b1823ae678c44d3d0892ff2bb44dc6ec844339717e1a8e0ce62ff564aee690e3f5d19c9ab254c6538ce2e3e4466c1789bc5b50beba787e49a8af22d60f892f
+  metadata.gz: c5044392ec3912a4e5d967ca8c5418bedad08f75176c53ade15d88f256d8658ca33570530cb3158de659d0b3fe517f13e6a68dce012a7ad569a2d99b7ce6fd9f
+  data.tar.gz: 41200b7ae13c0405c340ba1882e1ae064895734572ee6421a3adf1b6f5b3bc53ec2b5e2afda603312b4e8c7c9af05ccbd0e862f2a09d683ead29e47214ea2829

data/lib/queue_classic_plus/version.rb

@@ -1,3 +1,3 @@
 module QueueClassicPlus
-  VERSION = '4.0.0.alpha19'.freeze
+  VERSION = '4.0.0.alpha21'.freeze
 end

data/lib/queue_classic_plus/worker.rb

@@ -24,17 +24,22 @@ module QueueClassicPlus
         force_retry = true
       end
 
+      @failed_job_class_memoized = false
       @failed_job = job
       @raw_args = job[:args]
-      @failed_job_args = failed_job_class ? failed_job_class.deserialized(@raw_args) : @raw_args
-
-      if force_retry && !(failed_job_class.respond_to?(:disable_retries) && failed_job_class.disable_retries)
-        Metrics.increment("qc.force_retry", source: @q_name)
-        retry_with_remaining(e)
-      # The mailers doesn't have a retries_on?
-      elsif failed_job_class.respond_to?(:retries_on?) && failed_job_class.retries_on?(e)
-        Metrics.increment("qc.retry", source: @q_name)
-        retry_with_remaining(e)
+
+      if queue_classic_plus_job?
+        @failed_job_args = failed_job_class.deserialized(@raw_args)
+
+        if force_retry && !failed_job_class.disable_retries
+          Metrics.increment("qc.force_retry", source: @q_name)
+          retry_with_remaining(e)
+        elsif failed_job_class.retries_on?(e)
+          Metrics.increment("qc.retry", source: @q_name)
+          retry_with_remaining(e)
+        else
+          enqueue_failed(e)
+        end
       else
         enqueue_failed(e)
       end
@@ -60,10 +65,20 @@ module QueueClassicPlus
       (@failed_job[:remaining_retries] || max_retries).to_i
     end
 
+    def queue_classic_plus_job?
+      failed_job_class && failed_job_class < Base
+    end
+
     def failed_job_class
-      Object.const_get(@failed_job[:method].split('.')[0])
-    rescue NameError
-      nil
+      return @failed_job_class if @failed_job_class_memoized
+
+      @failed_job_class_memoized = true
+      @failed_job_class =
+      begin
+        Object.const_get(@failed_job[:method].split('.')[0])
+      rescue NameError
+        nil
+      end
     end
 
     def backoff

data/spec/worker_spec.rb

@@ -45,6 +45,48 @@ describe QueueClassicPlus::CustomWorker do
         expect(job).to_not be_nil
         expect(job['last_error']).to_not be_nil
       end
+
+      context 'for a non-QueueClassicPlus job' do
+        let(:job_type) do
+          Class.new(ActiveJob::Base) do
+            def self.name
+              "NonQcJob"
+            end
+
+            self.queue_adapter = :queue_classic
+
+            queue_as :test
+
+            def perform(boom)
+              raise boom.to_s
+            end
+          end.tap { Object.const_set(:NonQcJob, _1) }
+        end
+        let(:queue) { QC::Queue.new("test") }
+
+        it 'properly enqueues for jobs in the failed queue' do
+          non_qc_job = job_type.new(:boom).enqueue
+          job_id = non_qc_job.provider_job_id
+
+          expect(failed_queue.count).to eq(0)
+          job = find_job(job_id)
+          expect(job).to_not be_nil
+          expect(find_job(job_id.succ)).to be_nil
+          args = JSON.load(job['args']).first
+          expect(args['arguments']).to eq(QueueClassicPlus::Base.serialized([:boom]))
+
+          worker.work
+
+          expect(failed_queue.count).to eq(1)
+          expect(find_job(job_id)).to be_nil
+          job = find_job(job_id.succ)
+          expect(job).to_not be_nil
+          failed_args = JSON.load(job['args']).first
+          expect(failed_args['arguments']).to eq(QueueClassicPlus::Base.serialized([:boom]))
+          expect(job['last_error']).to_not be_nil
+          expect(job['last_error']).to start_with("boom\n")
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queue_classic_plus
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha19
+  version: 4.0.0.alpha21
 platform: ruby
 authors:
 - Simon Mathieu
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-10 00:00:00.000000000 Z
+date: 2023-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: queue_classic