aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-10-12 20:45:54 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-10-12 22:27:41 -0700
commitc8fe0d58bcc7deb49711606566c854bf0ed7f107 (patch)
tree49f8c2b9780f58117282eff2d86e0b08cd9065bf /guides
parent1dc2ea8f3dfc1cce1958bd661c641ed345adf910 (diff)
downloadrails-c8fe0d58bcc7deb49711606566c854bf0ed7f107.tar.gz
rails-c8fe0d58bcc7deb49711606566c854bf0ed7f107.tar.bz2
rails-c8fe0d58bcc7deb49711606566c854bf0ed7f107.zip
Backpedal from class-oriented config.queue. Set an actual queue instance.
Diffstat (limited to 'guides')
-rw-r--r--guides/source/4_0_release_notes.md4
-rw-r--r--guides/source/configuring.md4
2 files changed, 4 insertions, 4 deletions
diff --git a/guides/source/4_0_release_notes.md b/guides/source/4_0_release_notes.md
index 54fe49252f..c909ef1496 100644
--- a/guides/source/4_0_release_notes.md
+++ b/guides/source/4_0_release_notes.md
@@ -95,9 +95,9 @@ Railties
* Load all environments available in `config.paths["config/environments"]`.
-* Add `config.queue_consumer` to allow the default consumer to be configurable.
+* Add `config.queue_consumer` to change the job queue consumer from the default `ActiveSupport::ThreadedQueueConsumer`.
-* Add `Rails.queue` as an interface with a default implementation that consumes jobs in a separate thread.
+* Add `Rails.queue` for processing jobs in the background.
* Remove `Rack::SSL` in favour of `ActionDispatch::SSL`.
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index 2131a6c6a8..26c7976c6b 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -115,9 +115,9 @@ NOTE. The `config.asset_path` configuration is ignored if the asset pipeline is
* `config.middleware` allows you to configure the application's middleware. This is covered in depth in the [Configuring Middleware](#configuring-middleware) section below.
-* `config.queue` configures a different queue implementation for the application. Defaults to `ActiveSupport::SynchronousQueue`. Note that, if the default queue is changed, the default `queue_consumer` is not going to be initialized, it is up to the new queue implementation to handle starting and shutting down its own consumer(s).
+* `config.queue` configures the default job queue for the application. Defaults to `ActiveSupport::Queue.new` which processes jobs in a background thread. If you change the queue, you're responsible for running the jobs as well.
-* `config.queue_consumer` configures a different consumer implementation for the default queue. Defaults to `ActiveSupport::ThreadedQueueConsumer`.
+* `config.queue_consumer` configures a different job consumer for the default queue. Defaults to `ActiveSupport::ThreadedQueueConsumer`. The job consumer must respond to `start`.
* `config.reload_classes_only_on_change` enables or disables reloading of classes only when tracked files change. By default tracks everything on autoload paths and is set to true. If `config.cache_classes` is true, this option is ignored.