aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-10-12 18:01:04 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-10-12 19:38:40 -0700
commit775829869e23666e114edbe8d6d3ff08d5d71025 (patch)
tree3bfbcee2dace0d1fa842682a4443384a63beaa88 /railties/lib/rails/application.rb
parent32b4d464849d976431342aa0cfe2d4e17b10e9f0 (diff)
downloadrails-775829869e23666e114edbe8d6d3ff08d5d71025.tar.gz
rails-775829869e23666e114edbe8d6d3ff08d5d71025.tar.bz2
rails-775829869e23666e114edbe8d6d3ff08d5d71025.zip
Remove the queue container. Premature consolidation. Set up and maintain queues in the classes that use them instead.
Diffstat (limited to 'railties/lib/rails/application.rb')
-rw-r--r--railties/lib/rails/application.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index b30e6ff615..0a717c76b3 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -198,11 +198,7 @@ module Rails
end
def queue #:nodoc:
- @queue ||= ActiveSupport::QueueContainer.new(build_queue)
- end
-
- def build_queue #:nodoc:
- config.queue.new
+ @queue ||= config.queue || ActiveSupport::Queue.new
end
def to_app #:nodoc: