Skip to content

Commit feff48d

Browse files
committed
Rename concurrency_limit_duration to concurrency_duration
1 parent f5f286b commit feff48d

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Diff for: app/models/solid_queue/job/concurrency_controls.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module ConcurrencyControls
66
included do
77
has_one :blocked_execution, dependent: :destroy
88

9-
delegate :concurrency_limit, :concurrency_limit_duration, to: :job_class
9+
delegate :concurrency_limit, :concurrency_duration, to: :job_class
1010
end
1111

1212
def unblock_blocked_jobs

Diff for: app/models/solid_queue/semaphore.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ class SolidQueue::Semaphore < SolidQueue::Record
66
class << self
77
def wait(job)
88
if semaphore = find_by(key: job.concurrency_key)
9-
semaphore.value > 0 && attempt_decrement(job.concurrency_key, job.concurrency_limit_duration)
9+
semaphore.value > 0 && attempt_decrement(job.concurrency_key, job.concurrency_duration)
1010
else
11-
attempt_creation(job.concurrency_key, job.concurrency_limit, job.concurrency_limit_duration)
11+
attempt_creation(job.concurrency_key, job.concurrency_limit, job.concurrency_duration)
1212
end
1313
end
1414

1515
def signal(job)
16-
attempt_increment(job.concurrency_key, job.concurrency_limit, job.concurrency_limit_duration)
16+
attempt_increment(job.concurrency_key, job.concurrency_limit, job.concurrency_duration)
1717
end
1818

1919
private

Diff for: lib/active_job/concurrency_controls.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ module ConcurrencyControls
1010
class_attribute :concurrency_key, default: DEFAULT_CONCURRENCY_KEY, instance_accessor: false
1111

1212
class_attribute :concurrency_limit, default: 0 # No limit
13-
class_attribute :concurrency_limit_duration, default: SolidQueue.default_concurrency_control_period
13+
class_attribute :concurrency_duration, default: SolidQueue.default_concurrency_control_period
1414
end
1515

1616
class_methods do
1717
def restrict_concurrency_with(limit: 1, key: DEFAULT_CONCURRENCY_KEY, duration: SolidQueue.default_concurrency_control_period)
1818
self.concurrency_limit = limit
1919
self.concurrency_key = key
20-
self.concurrency_limit_duration = duration
20+
self.concurrency_duration = duration
2121
end
2222
end
2323

0 commit comments

Comments
 (0)