Skip to content

Commit 8d47ed4

Browse files
committed
Use queue to specify the queue for a recurring task in configuration
To match worker's `queues` configuration.
1 parent 3c94a36 commit 8d47ed4

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

app/models/solid_queue/recurring_task.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def from_configuration(key, **options)
2222
class_name: options[:class],
2323
arguments: options[:args],
2424
schedule: options[:schedule],
25-
queue_name: options[:queue_name].presence,
25+
queue_name: options[:queue].presence,
2626
priority: options[:priority].presence,
2727
description: options[:description],
2828
static: true

test/dummy/config/recurring.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
periodic_store_result:
22
class: StoreResultJob
3+
queue: default
34
args: [ 42, { status: "custom_status" } ]
45
schedule: every second

test/models/solid_queue/recurring_task_test.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def perform
130130
end
131131

132132
test "task with custom queue and priority" do
133-
task = recurring_task_with(class_name: "JobWithoutArguments", queue_name: "my_new_queue", priority: 4)
133+
task = recurring_task_with(class_name: "JobWithoutArguments", queue: "my_new_queue", priority: 4)
134134
enqueue_and_assert_performed_with_result task, "job_without_arguments"
135135

136136
job = SolidQueue::Job.last
@@ -170,7 +170,7 @@ def enqueue_and_assert_performed_with_result(task, result)
170170
assert_equal result, JobBuffer.last_value
171171
end
172172

173-
def recurring_task_with(class_name:, schedule: "every hour", args: nil, **options)
174-
SolidQueue::RecurringTask.new(key: "task-id", class_name: "SolidQueue::RecurringTaskTest::#{class_name}", schedule: schedule, arguments: args, **options)
173+
def recurring_task_with(class_name:, **options)
174+
SolidQueue::RecurringTask.from_configuration("task-id", class: "SolidQueue::RecurringTaskTest::#{class_name}", **options.with_defaults(schedule: "every hour"))
175175
end
176176
end

0 commit comments

Comments
 (0)