aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application/configuration.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-05-04 05:44:21 -0700
committerJosé Valim <jose.valim@gmail.com>2012-05-04 05:44:21 -0700
commitffad3600ea01cda457b447fafd4d38907f4d0bfb (patch)
tree92eb0e987a128b9d983d139564ec759b8ea2543f /railties/lib/rails/application/configuration.rb
parent3d9673d8f6fdb5e330b2a276df288834058a5260 (diff)
parent7a6116b633479effe81a820d84aaf29572cc3412 (diff)
downloadrails-ffad3600ea01cda457b447fafd4d38907f4d0bfb.tar.gz
rails-ffad3600ea01cda457b447fafd4d38907f4d0bfb.tar.bz2
rails-ffad3600ea01cda457b447fafd4d38907f4d0bfb.zip
Merge pull request #6153 from carlosantoniodasilva/queue-consumer
Configurable queue consumer
Diffstat (limited to 'railties/lib/rails/application/configuration.rb')
-rw-r--r--railties/lib/rails/application/configuration.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 25bb680f69..a2e5dece16 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -8,10 +8,11 @@ module Rails
attr_accessor :allow_concurrency, :asset_host, :asset_path, :assets, :autoflush_log,
:cache_classes, :cache_store, :consider_all_requests_local, :console,
:dependency_loading, :exceptions_app, :file_watcher, :filter_parameters,
- :force_ssl, :helpers_paths, :logger, :log_formatter, :log_tags, :preload_frameworks,
- :railties_order, :relative_url_root, :secret_token,
+ :force_ssl, :helpers_paths, :logger, :log_formatter, :log_tags,
+ :preload_frameworks, :railties_order, :relative_url_root, :secret_token,
:serve_static_assets, :ssl_options, :static_cache_control, :session_options,
- :time_zone, :reload_classes_only_on_change, :use_schema_cache_dump, :queue
+ :time_zone, :reload_classes_only_on_change, :use_schema_cache_dump,
+ :queue, :queue_consumer
attr_writer :log_level
attr_reader :encoding
@@ -44,6 +45,7 @@ module Rails
@log_formatter = ActiveSupport::Logger::SimpleFormatter.new
@use_schema_cache_dump = true
@queue = Rails::Queueing::Queue
+ @queue_consumer = Rails::Queueing::ThreadedConsumer
@assets = ActiveSupport::OrderedOptions.new
@assets.enabled = false