From 7645e1e8b37875f2c2d8a973626522dd29fbfc20 Mon Sep 17 00:00:00 2001 From: Chris Kalafarski Date: Fri, 9 Oct 2015 20:32:48 -0400 Subject: [PATCH 1/2] Fix Active Job queue prefixing in Rails apps --- lib/shoryuken/environment_loader.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/shoryuken/environment_loader.rb b/lib/shoryuken/environment_loader.rb index 84259882..02bf2a4d 100644 --- a/lib/shoryuken/environment_loader.rb +++ b/lib/shoryuken/environment_loader.rb @@ -113,7 +113,7 @@ def merge_cli_defined_queues end def prefix_active_job_queue_names - return unless @options[:rails] + return unless @options[:rails] || defined? Rails return unless Shoryuken.active_job_queue_name_prefixing queue_name_prefix = ::ActiveJob::Base.queue_name_prefix From a3cc734265e668acfc53efae06be948a3adaf835 Mon Sep 17 00:00:00 2001 From: Chris Kalafarski Date: Fri, 9 Oct 2015 20:37:30 -0400 Subject: [PATCH 2/2] Better checking for Active Job prefix conditions --- lib/shoryuken/environment_loader.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/shoryuken/environment_loader.rb b/lib/shoryuken/environment_loader.rb index 02bf2a4d..caeb6eff 100644 --- a/lib/shoryuken/environment_loader.rb +++ b/lib/shoryuken/environment_loader.rb @@ -113,7 +113,7 @@ def merge_cli_defined_queues end def prefix_active_job_queue_names - return unless @options[:rails] || defined? Rails + return unless defined? ::ActiveJob return unless Shoryuken.active_job_queue_name_prefixing queue_name_prefix = ::ActiveJob::Base.queue_name_prefix