diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2016-02-05 16:05:48 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2016-02-05 16:05:48 +0100 |
| commit | 439fadf758f6f0bc50e3d8c6f96b0ddbd613d299 (patch) | |
| tree | 8f1ac9bce467deb262e8f3408a2960459c5297ed /activejob/lib | |
| parent | 625baa69d14881ac49ba2e5c7d9cac4b222d7022 (diff) | |
| download | rails-439fadf758f6f0bc50e3d8c6f96b0ddbd613d299.tar.gz rails-439fadf758f6f0bc50e3d8c6f96b0ddbd613d299.tar.bz2 rails-439fadf758f6f0bc50e3d8c6f96b0ddbd613d299.zip | |
Missed a few spots in inline -> async switch
Diffstat (limited to 'activejob/lib')
| -rw-r--r-- | activejob/lib/active_job/queue_adapter.rb | 2 | ||||
| -rw-r--r-- | activejob/lib/active_job/railtie.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activejob/lib/active_job/queue_adapter.rb b/activejob/lib/active_job/queue_adapter.rb index 7dfdd0ae5c..72e4ebf935 100644 --- a/activejob/lib/active_job/queue_adapter.rb +++ b/activejob/lib/active_job/queue_adapter.rb @@ -4,7 +4,7 @@ require 'active_support/core_ext/string/inflections' module ActiveJob # The <tt>ActiveJob::QueueAdapter</tt> module is used to load the - # correct adapter. The default queue adapter is the +:inline+ queue. + # correct adapter. The default queue adapter is the +:async+ queue. module QueueAdapter #:nodoc: extend ActiveSupport::Concern diff --git a/activejob/lib/active_job/railtie.rb b/activejob/lib/active_job/railtie.rb index 6538ac1b30..b249ec09dd 100644 --- a/activejob/lib/active_job/railtie.rb +++ b/activejob/lib/active_job/railtie.rb @@ -12,7 +12,7 @@ module ActiveJob initializer "active_job.set_configs" do |app| options = app.config.active_job - options.queue_adapter ||= :inline + options.queue_adapter ||= :async ActiveSupport.on_load(:active_job) do options.each { |k,v| send("#{k}=", v) } |