diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2014-05-19 13:14:09 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2014-05-19 13:14:09 +0200 |
| commit | c2cdb8beccc6dda9f6b4d89498a32807bbffd84d (patch) | |
| tree | d97c6c6d1be96e330ec6120ca76761e26ee5c61f /lib/active_job | |
| parent | c69dda49880df94c7243e9dc5fcf43a223769f43 (diff) | |
| parent | 60b8af42e929adc397b92877a3274b9bfd110c4b (diff) | |
| download | rails-c2cdb8beccc6dda9f6b4d89498a32807bbffd84d.tar.gz rails-c2cdb8beccc6dda9f6b4d89498a32807bbffd84d.tar.bz2 rails-c2cdb8beccc6dda9f6b4d89498a32807bbffd84d.zip | |
Merge branch 'master' of github.com:rails/activejob
Diffstat (limited to 'lib/active_job')
| -rw-r--r-- | lib/active_job/queue_adapter.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/active_job/queue_adapter.rb b/lib/active_job/queue_adapter.rb index a1987a7dc3..2033f6fe56 100644 --- a/lib/active_job/queue_adapter.rb +++ b/lib/active_job/queue_adapter.rb @@ -6,12 +6,13 @@ module ActiveJob mattr_reader(:queue_adapter) { ActiveJob::QueueAdapters::InlineAdapter } def queue_adapter=(name_or_adapter) - if name_or_adapter.is_a?(Symbol) || name_or_adapter.is_a?(String) + case name_or_adapter + when Symbol, String adapter = load_adapter(name_or_adapter) else adapter = name_or_adapter end - + @@queue_adapter = adapter end |