From b47c01519427a4cfc6e7f7606b6e686790f155aa Mon Sep 17 00:00:00 2001 From: Josh Sharpe Date: Sun, 5 Apr 2020 17:40:29 -0400 Subject: [PATCH] when retrieving queue name, check for 'queue_as' which is how ActiveJob defines queue names --- lib/resque.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/resque.rb b/lib/resque.rb index b6ab1093d..076c5cf7c 100644 --- a/lib/resque.rb +++ b/lib/resque.rb @@ -502,8 +502,9 @@ def dequeue(klass, *args) # Given a class, try to extrapolate an appropriate queue based on a # class instance variable or `queue` method. def queue_from_class(klass) - (klass.instance_variable_defined?(:@queue) && klass.instance_variable_get(:@queue)) || - (klass.respond_to?(:queue) and klass.queue) + klass.instance_variable_get(:@queue) || + (klass.respond_to?(:queue) && klass.queue) || + (klass.respond_to?(:queue_name) && klass.new.queue_name) end # This method will return a `Resque::Job` object or a non-true value