diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2018-01-05 17:16:11 +0900 |
---|---|---|
committer | Ryuta Kamizono <kamipo@gmail.com> | 2018-01-05 17:18:56 +0900 |
commit | 5a5014688873f1d6e1b66075eea8a4356b5a4d07 (patch) | |
tree | f9288a9cf6880c8a6b2a0df39b2c78b782c28301 /activejob/lib/active_job | |
parent | e243866d9b1725e272550e8ae6d5c0594f37f6a1 (diff) | |
download | rails-5a5014688873f1d6e1b66075eea8a4356b5a4d07.tar.gz rails-5a5014688873f1d6e1b66075eea8a4356b5a4d07.tar.bz2 rails-5a5014688873f1d6e1b66075eea8a4356b5a4d07.zip |
Consolidate `queue_adapter=` and `interpret_adapter`
Since #25037, `queue_adapter=` simply delegates to `interpret_adapter`
only.
Diffstat (limited to 'activejob/lib/active_job')
-rw-r--r-- | activejob/lib/active_job/queue_adapter.rb | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/activejob/lib/active_job/queue_adapter.rb b/activejob/lib/active_job/queue_adapter.rb index dd05800baf..006a683b85 100644 --- a/activejob/lib/active_job/queue_adapter.rb +++ b/activejob/lib/active_job/queue_adapter.rb @@ -29,28 +29,22 @@ module ActiveJob # Specify the backend queue provider. The default queue adapter # is the +:async+ queue. See QueueAdapters for more # information. - def queue_adapter=(name_or_adapter_or_class) - interpret_adapter(name_or_adapter_or_class) - end - - private - - def interpret_adapter(name_or_adapter_or_class) - case name_or_adapter_or_class - when Symbol, String - assign_adapter(name_or_adapter_or_class.to_s, - ActiveJob::QueueAdapters.lookup(name_or_adapter_or_class).new) + def queue_adapter=(name_or_adapter) + case name_or_adapter + when Symbol, String + queue_adapter = ActiveJob::QueueAdapters.lookup(name_or_adapter).new + assign_adapter(name_or_adapter.to_s, queue_adapter) + else + if queue_adapter?(name_or_adapter) + adapter_name = "#{name_or_adapter.class.name.demodulize.remove('Adapter').underscore}" + assign_adapter(adapter_name, name_or_adapter) else - if queue_adapter?(name_or_adapter_or_class) - adapter_name = "#{name_or_adapter_or_class.class.name.demodulize.remove('Adapter').underscore}" - assign_adapter(adapter_name, - name_or_adapter_or_class) - else - raise ArgumentError - end + raise ArgumentError end end + end + private def assign_adapter(adapter_name, queue_adapter) self._queue_adapter_name = adapter_name self._queue_adapter = queue_adapter |