From f9da785d0b1b22317cfca25c15fb555e9016accb Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Fri, 21 Dec 2012 15:42:47 -0800
Subject: Move background jobs to the 'jobs' branch until fully baked. Not
 shipping with Rails 4.0.

---
 railties/lib/rails/application/configuration.rb | 5 +----
 railties/lib/rails/application/finisher.rb      | 9 ---------
 2 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'railties/lib/rails/application')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index f15fc9296d..086fd5ed95 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -1,6 +1,5 @@
 require 'active_support/core_ext/kernel/reporting'
 require 'active_support/file_update_checker'
-require 'active_support/queueing'
 require 'rails/engine/configuration'
 
 module Rails
@@ -13,7 +12,7 @@ module Rails
                     :railties_order, :relative_url_root, :secret_key_base, :secret_token,
                     :serve_static_assets, :ssl_options, :static_cache_control, :session_options,
                     :time_zone, :reload_classes_only_on_change,
-                    :queue, :queue_consumer, :beginning_of_week, :filter_redirect
+                    :beginning_of_week, :filter_redirect
 
       attr_writer :log_level
       attr_reader :encoding
@@ -44,8 +43,6 @@ module Rails
         @exceptions_app                = nil
         @autoflush_log                 = true
         @log_formatter                 = ActiveSupport::Logger::SimpleFormatter.new
-        @queue                         = ActiveSupport::SynchronousQueue.new
-        @queue_consumer                = nil
         @eager_load                    = nil
         @secret_token                  = nil
         @secret_key_base               = nil
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index 09902ad597..872d78d9a4 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -96,15 +96,6 @@ module Rails
           ActiveSupport::Dependencies.unhook!
         end
       end
-
-      initializer :activate_queue_consumer do |app|
-        if config.queue.class == ActiveSupport::Queue
-          app.queue_consumer = config.queue_consumer || config.queue.consumer
-          app.queue_consumer.logger ||= Rails.logger if app.queue_consumer.respond_to?(:logger=)
-          app.queue_consumer.start
-          at_exit { app.queue_consumer.shutdown }
-        end
-      end
     end
   end
 end
-- 
cgit v1.2.3