Skip to content

Commit

Permalink
Filter by configured queue name prefix when fetching queues
Browse files Browse the repository at this point in the history
That's it, by active_job.config.queue_name_prefix. This is useful when
an adapter has queues from different environments mixed together.
  • Loading branch information
rosa committed Dec 1, 2023
1 parent 083b7e6 commit 3b67eb9
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 4 deletions.
6 changes: 4 additions & 2 deletions lib/active_job/querying.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ def jobs
private
def fetch_queues
queue_adapter.queues.collect do |queue|
ActiveJob::Queue.new(queue[:name], size: queue[:size], active: queue[:active], queue_adapter: queue_adapter)
end
if !queue_name_prefix || queue[:name].start_with?(queue_name_prefix)
ActiveJob::Queue.new(queue[:name], size: queue[:size], active: queue[:active], queue_adapter: queue_adapter)
end
end.compact
end
end

Expand Down
23 changes: 21 additions & 2 deletions test/system/list_queues_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,35 @@
class ListQueuesTest < ApplicationSystemTestCase
setup do
create_queues *10.times.collect { |index| "queue_#{index}" }

visit queues_path
end

test "list queues sorted by name" do
visit queues_path

assert_equal 10, queue_row_elements.length
queue_row_elements.each.with_index do |queue_element, index|
within queue_element do
assert_text "queue_#{index}"
end
end
end

test "list queues sorted by name and filtered by prefix" do
with_queue_name_prefix do
visit queues_path

assert_equal 1, queue_row_elements.length
within queue_row_elements.first do
assert_text "queue_1"
end
end
end

private
def with_queue_name_prefix(&block)
previous_prefix, ActiveJob::Base.queue_name_prefix = ActiveJob::Base.queue_name_prefix, "queue_1"
yield
ensure
ActiveJob::Base.queue_name_prefix = previous_prefix
end
end

0 comments on commit 3b67eb9

Please sign in to comment.