Include concurrency controls extension directly in ActiveJob

rails · Nov 16, 2023 · 6b11253 · 6b11253
1 parent cfee579
commit 6b11253
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/lib/solid_queue/engine.rb b/lib/solid_queue/engine.rb
@@ -27,5 +27,11 @@ class Engine < ::Rails::Engine
         self.logger = app.logger
       end
     end
+
+    initializer "solid_queue.active_job.extensions" do
+      ActiveSupport.on_load :active_job do
+        include ActiveJob::ConcurrencyControls
+      end
+    end
   end
 end
diff --git a/test/dummy/app/jobs/sequential_update_result_job.rb b/test/dummy/app/jobs/sequential_update_result_job.rb
@@ -1,5 +1,3 @@
 class SequentialUpdateResultJob < UpdateResultJob
-  include ActiveJob::ConcurrencyControls
-
   restrict_concurrency_with limit: 1, key: ->(job_result, **) { job_result }
 end
diff --git a/test/dummy/app/jobs/throttled_update_result_job.rb b/test/dummy/app/jobs/throttled_update_result_job.rb
@@ -1,5 +1,3 @@
 class ThrottledUpdateResultJob < UpdateResultJob
-  include ActiveJob::ConcurrencyControls
-
   restrict_concurrency_with limit: 3, key: ->(job_result, **) { job_result }
 end
diff --git a/test/dummy/app/jobs/update_result_job.rb b/test/dummy/app/jobs/update_result_job.rb
@@ -1,6 +1,4 @@
 class UpdateResultJob < ApplicationJob
-  include ActiveJob::ConcurrencyControls
-
   def perform(job_result, name:, pause: nil, exception: nil)
     job_result.status += "s#{name}"
 

diff --git a/test/models/solid_queue/job_test.rb b/test/models/solid_queue/job_test.rb
@@ -2,8 +2,6 @@
 
 class SolidQueue::JobTest < ActiveSupport::TestCase
   class NonOverlappingJob < ApplicationJob
-    include ActiveJob::ConcurrencyControls
-
     restrict_concurrency_with limit: 1, key: ->(job_result, **) { job_result }
 
     def perform(job_result)