[RF-22752] Fix argument serializing when enqueuing failed job

README.md

@@ -169,3 +169,7 @@ require "queue_classic_plus/datadog"
 ```
 createdb queue_classic_plus_test
 ```
+
+## Releasing
+
+Releasing is done in CircleCI via the `push_to_rubygems`, triggered by pushing a tagged commit. To do so, simply [create a new GitHub release](https://github.com/rainforestapp/queue_classic_plus/releases/new).

lib/queue_classic_plus/version.rb

@@ -1,3 +1,3 @@
 module QueueClassicPlus
-  VERSION = '4.0.0.alpha8'.freeze
+  VERSION = '4.0.0.alpha9'.freeze
 end

lib/queue_classic_plus/worker.rb

@@ -25,13 +25,14 @@ def handle_failure(job, e)
       end
 
       @failed_job = job
-      @failed_job_args = failed_job_class ? failed_job_class.deserialized(job[:args]) : job[:args]
+      @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 && failed_job_class.respond_to?(:retries_on?) && failed_job_class.retries_on?(e)
+      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)
       else
@@ -60,11 +61,9 @@ def remaining_retries
     end
 
     def failed_job_class
-      begin
-        Object.const_get(@failed_job[:method].split('.')[0])
-      rescue NameError
-        nil
-      end
+      Object.const_get(@failed_job[:method].split('.')[0])
+    rescue NameError
+      nil
     end
 
     def backoff
@@ -80,7 +79,8 @@ def connection_error?(e)
     def enqueue_failed(e)
       sql = "INSERT INTO #{QC.table_name} (q_name, method, args, last_error) VALUES ('failed_jobs', $1, $2, $3)"
       last_error = e.backtrace ? ([e.message] + e.backtrace ).join("\n") : e.message
-      QC.default_conn_adapter.execute sql, @failed_job[:method], JSON.dump(@failed_job_args), last_error
+
+      QC.default_conn_adapter.execute sql, @failed_job[:method], JSON.dump(@raw_args), last_error
 
       QueueClassicPlus.exception_handler.call(e, @failed_job)
       Metrics.increment("qc.errors", source: @q_name)

spec/base_spec.rb

@@ -160,11 +160,7 @@ def self.perform
       end
     end
 
-    context "with Rails defined" do
-      require 'active_job/arguments'
-
-      before { stub_const('Rails', true) }
-
+    context "with Rails defined", rails: true do
       subject do
         Class.new(QueueClassicPlus::Base) do
           @queue = :test

spec/spec_helper.rb

@@ -26,4 +26,11 @@
     # Reset the default (memoized) queue instance between specs
     QC.default_queue = nil
   end
+
+  config.before(:each, rails: true) do
+    require 'active_job'
+    require 'active_job/arguments'
+
+    stub_const('Rails', Struct.new(:logger).new(Logger.new(STDOUT)))
+  end
 end

spec/worker_spec.rb

@@ -26,6 +26,26 @@
       worker.work
       expect(failed_queue.count).to eq(1)
     end
+
+    context 'when Rails is defined', rails: true do
+      let(:job_type) { Jobs::Tests::TestJobNoRetry }
+      let(:queue) { job_type.queue }
+
+      it 'properly serializes arguments for jobs in the failed queue' do
+        job_type.enqueue_perform(:raise)
+        expect(failed_queue.count).to eq(0)
+        worker.work
+
+        expect(failed_queue.count).to eq(1)
+        job = QueueClassicMatchers::QueueClassicRspec.find_by_args(
+          'failed_jobs',
+          'Jobs::Tests::TestJobNoRetry._perform',
+          [:raise]).first
+
+        expect(job).to_not be_nil
+        expect(job['last_error']).to_not be_nil
+      end
+    end
   end
 
   context "retry" do
@@ -67,12 +87,7 @@
       end
     end
 
-    context 'when Rails is defined' do
-      require 'active_job'
-      require 'active_job/arguments'
-
-      before { stub_const('Rails', Struct.new(:logger).new(Logger.new(STDOUT))) }
-
+    context 'when Rails is defined', rails: true do
       it 'retries' do
         expect do
           job_type.enqueue_perform(:foo)