Merge pull request #47556 from codez/failsafe_delayed_job_name

Make delayed job display_name failsafe
rails · Mar 3, 2023 · dd7ecb0 · dd7ecb0
2 parents 18e53fb + 3d3ed6e
commit dd7ecb0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb b/activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb
@@ -50,6 +50,8 @@ def perform
         private
           def log_arguments?
             job_data["job_class"].constantize.log_arguments?
+          rescue NameError
+            false
           end
       end
     end

diff --git a/activejob/test/cases/delayed_job_adapter_test.rb b/activejob/test/cases/delayed_job_adapter_test.rb
@@ -30,4 +30,17 @@ class DelayedJobAdapterTest < ActiveSupport::TestCase
     assert_equal "HelloJob [#{job_id}] from DelayedJob(default) with arguments: #{arguments}",
                  job_wrapper.display_name
   end
+
+  test "shows name for invalid job class" do
+    job_id = SecureRandom.uuid
+
+    job_wrapper = ActiveJob::QueueAdapters::DelayedJobAdapter::JobWrapper.new(
+      "job_class" => "NotExistingJob",
+      "queue_name" => "default",
+      "job_id" => job_id,
+      "arguments" => { "some" => { "job" => "arguments" } }
+    )
+
+    assert_equal "NotExistingJob [#{job_id}] from DelayedJob(default)", job_wrapper.display_name
+  end
 end