From aad22b71842f522fc5e3b1a27a370a3d68c93fa3 Mon Sep 17 00:00:00 2001
From: Rosa Gutierrez <rosa@37signals.com>
Date: Mon, 20 Nov 2023 18:01:15 +0100
Subject: [PATCH] Rename `concurrency_limit_duration` to `concurrency_duration`

---
 app/models/solid_queue/job/concurrency_controls.rb | 2 +-
 app/models/solid_queue/semaphore.rb                | 6 +++---
 lib/active_job/concurrency_controls.rb             | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/models/solid_queue/job/concurrency_controls.rb b/app/models/solid_queue/job/concurrency_controls.rb
index e22d60c1..8fe3a31a 100644
--- a/app/models/solid_queue/job/concurrency_controls.rb
+++ b/app/models/solid_queue/job/concurrency_controls.rb
@@ -6,7 +6,7 @@ module ConcurrencyControls
       included do
         has_one :blocked_execution, dependent: :destroy
 
-        delegate :concurrency_limit, :concurrency_limit_duration, to: :job_class
+        delegate :concurrency_limit, :concurrency_duration, to: :job_class
       end
 
       def unblock_blocked_jobs
diff --git a/app/models/solid_queue/semaphore.rb b/app/models/solid_queue/semaphore.rb
index 7bb3dc05..a4bb9be4 100644
--- a/app/models/solid_queue/semaphore.rb
+++ b/app/models/solid_queue/semaphore.rb
@@ -6,14 +6,14 @@ class SolidQueue::Semaphore < SolidQueue::Record
   class << self
     def wait(job)
       if semaphore = find_by(key: job.concurrency_key)
-        semaphore.value > 0 && attempt_decrement(job.concurrency_key, job.concurrency_limit_duration)
+        semaphore.value > 0 && attempt_decrement(job.concurrency_key, job.concurrency_duration)
       else
-        attempt_creation(job.concurrency_key, job.concurrency_limit, job.concurrency_limit_duration)
+        attempt_creation(job.concurrency_key, job.concurrency_limit, job.concurrency_duration)
       end
     end
 
     def signal(job)
-      attempt_increment(job.concurrency_key, job.concurrency_limit, job.concurrency_limit_duration)
+      attempt_increment(job.concurrency_key, job.concurrency_limit, job.concurrency_duration)
     end
 
     private
diff --git a/lib/active_job/concurrency_controls.rb b/lib/active_job/concurrency_controls.rb
index bed96af1..895d7cfb 100644
--- a/lib/active_job/concurrency_controls.rb
+++ b/lib/active_job/concurrency_controls.rb
@@ -10,14 +10,14 @@ module ConcurrencyControls
       class_attribute :concurrency_key, default: DEFAULT_CONCURRENCY_KEY, instance_accessor: false
 
       class_attribute :concurrency_limit, default: 0 # No limit
-      class_attribute :concurrency_limit_duration, default: SolidQueue.default_concurrency_control_period
+      class_attribute :concurrency_duration, default: SolidQueue.default_concurrency_control_period
     end
 
     class_methods do
       def restrict_concurrency_with(limit: 1, key: DEFAULT_CONCURRENCY_KEY, duration: SolidQueue.default_concurrency_control_period)
         self.concurrency_limit = limit
         self.concurrency_key = key
-        self.concurrency_limit_duration = duration
+        self.concurrency_duration = duration
       end
     end