Move queue classes to ActiveSupport

2 files changed, 5 insertions, 4 deletions

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 7a0bb21043..c4c1fcca40 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -1,5 +1,6 @@
 require 'active_support/core_ext/kernel/reporting'
 require 'active_support/file_update_checker'
+require 'active_support/queueing'
 require 'rails/engine/configuration'
 
 module Rails
@@ -41,8 +42,8 @@ module Rails
         @exceptions_app                = nil
         @autoflush_log                 = true
         @log_formatter                 = ActiveSupport::Logger::SimpleFormatter.new
-        @queue                         = Rails::Queueing::SynchronousQueue
-        @queue_consumer                = Rails::Queueing::ThreadedConsumer
+        @queue                         = ActiveSupport::SynchronousQueue
+        @queue_consumer                = ActiveSupport::ThreadedQueueConsumer
         @eager_load                    = nil
 
         @assets = ActiveSupport::OrderedOptions.new
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index 777f0d269e..f9a3c00946 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -97,8 +97,8 @@ module Rails
       end
 
       initializer :activate_queue_consumer do |app|
-        if config.queue == Rails::Queueing::Queue
-          app.queue_consumer = config.queue_consumer.start(app.queue)
+        if config.queue == ActiveSupport::Queue
+          app.queue_consumer = config.queue_consumer.start(app.queue, Rails.logger)
           at_exit { app.queue_consumer.shutdown }
         end
       end