ActiveJob: Reworked queue_base_name as default_queue_name + Allow configure ActiveJob from app.config.active_job

2 files changed, 17 insertions, 5 deletions

diff --git a/activejob/lib/active_job/queue_name.rb b/activejob/lib/active_job/queue_name.rb
index 859ddad034..c2186d9fe9 100644
--- a/activejob/lib/active_job/queue_name.rb
+++ b/activejob/lib/active_job/queue_name.rb
@@ -3,16 +3,16 @@ module ActiveJob
     extend ActiveSupport::Concern
 
     module ClassMethods
-      mattr_accessor(:queue_base_name) { "active_jobs" }
+      mattr_accessor(:default_queue_name) { "default" }
 
       def queue_as(part_name)
-        self.queue_name = "#{queue_base_name}_#{part_name}"
+        self.queue_name = part_name.to_s.presence || default_queue_name
       end
     end
 
     included do
       class_attribute :queue_name
-      self.queue_name = queue_base_name
+      self.queue_name = default_queue_name
     end
   end
-end
\ No newline at end of file
+end
diff --git a/activejob/lib/active_job/railtie.rb b/activejob/lib/active_job/railtie.rb
index 16736374af..7c1dd8f275 100644
--- a/activejob/lib/active_job/railtie.rb
+++ b/activejob/lib/active_job/railtie.rb
@@ -4,8 +4,20 @@ require 'rails'
 module ActiveJob
   # = Active Job Railtie
   class Railtie < Rails::Railtie # :nodoc:
-    initializer 'active_job' do
+    config.active_job = ActiveSupport::OrderedOptions.new
+
+    initializer 'active_job.logger' do
       ActiveSupport.on_load(:active_job) { self.logger = ::Rails.logger }
     end
+
+    initializer "active_job.set_configs" do |app|
+      options = app.config.active_job
+      options.queue_adapter ||= :inline
+
+      ActiveSupport.on_load(:active_job) do
+        options.each { |k,v| send("#{k}=", v) }
+      end
+    end
+
   end
 end