diff options
author | José Valim <jose.valim@gmail.com> | 2012-04-28 09:26:23 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2012-04-28 09:26:23 +0200 |
commit | 9fc9e894771d1915fe3e565305424ed9ca537b79 (patch) | |
tree | 230eaf3974918f1c6aad86b67dd4c554b8e40aa7 /railties/lib/rails/application | |
parent | fc6b115b88eb600a3eefb47484f4e8462c103cbe (diff) | |
download | rails-9fc9e894771d1915fe3e565305424ed9ca537b79.tar.gz rails-9fc9e894771d1915fe3e565305424ed9ca537b79.tar.bz2 rails-9fc9e894771d1915fe3e565305424ed9ca537b79.zip |
Use Rails::Queueing::Queue instead of Queue so people can build their own consumers around stdlib's Queue
Diffstat (limited to 'railties/lib/rails/application')
-rw-r--r-- | railties/lib/rails/application/configuration.rb | 2 | ||||
-rw-r--r-- | railties/lib/rails/application/finisher.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index a36dad0e98..25bb680f69 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -43,7 +43,7 @@ module Rails @autoflush_log = true @log_formatter = ActiveSupport::Logger::SimpleFormatter.new @use_schema_cache_dump = true - @queue = Queue + @queue = Rails::Queueing::Queue @assets = ActiveSupport::OrderedOptions.new @assets.enabled = false diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb index 6475b381f4..6a24e01f29 100644 --- a/railties/lib/rails/application/finisher.rb +++ b/railties/lib/rails/application/finisher.rb @@ -95,7 +95,7 @@ module Rails end initializer :activate_queue_consumer do |app| - if config.queue == Queue + if config.queue == Rails::Queueing::Queue consumer = Rails::Queueing::ThreadedConsumer.start(app.queue) at_exit { consumer.shutdown } end |