Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add default key for limits_concurrency #545

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add default key for limits_concurrency #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/active_job/concurrency_controls.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ module ConcurrencyControls
extend ActiveSupport::Concern

DEFAULT_CONCURRENCY_GROUP = ->(*) { self.class.name }
DEFAULT_CONCURRENCY_KEY = ->(*) { nil }

included do
class_attribute :concurrency_key, instance_accessor: false
Expand All @@ -15,7 +16,7 @@ module ConcurrencyControls
end

class_methods do
def limits_concurrency(key:, to: 1, group: DEFAULT_CONCURRENCY_GROUP, duration: SolidQueue.default_concurrency_control_period)
def limits_concurrency(key: DEFAULT_CONCURRENCY_KEY, to: 1, group: DEFAULT_CONCURRENCY_GROUP, duration: SolidQueue.default_concurrency_control_period)
self.concurrency_key = key
self.concurrency_limit = to
self.concurrency_group = group
Expand Down
17 changes: 17 additions & 0 deletions test/models/solid_queue/job_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ def perform(job_result)
end
end

class NonOverlappingDefaultJob < ApplicationJob
limits_concurrency

def perform(job_result)
end
end

class NonOverlappingGroupedJob1 < NonOverlappingJob
limits_concurrency key: ->(job_result, **) { job_result }, group: "MyGroup"
end
Expand Down Expand Up @@ -98,6 +105,16 @@ class NonOverlappingGroupedJob2 < NonOverlappingJob
assert_equal active_job.concurrency_key, job.concurrency_key
end

test "enqueue jobs with concurrency controls default options" do
active_job = NonOverlappingDefaultJob.perform_later(@result, name: "A")
assert_equal 1, active_job.concurrency_limit
assert_equal "SolidQueue::JobTest::NonOverlappingDefaultJob", active_job.concurrency_key

job = SolidQueue::Job.last
assert_equal active_job.concurrency_limit, job.concurrency_limit
assert_equal active_job.concurrency_key, job.concurrency_key
end

test "enqueue jobs with concurrency controls in the same concurrency group" do
assert_ready do
active_job = NonOverlappingGroupedJob1.perform_later(@result, name: "A")
Expand Down
Loading