diff options
| author | David Heinemeier Hansson <david@basecamp.com> | 2014-07-03 11:56:42 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@basecamp.com> | 2014-07-03 11:56:42 -0500 |
| commit | b24b7b9b76fa59eeddeb91b32b24d52e17f19a16 (patch) | |
| tree | f1400da8423f982b22c67a4ee5d9aa7547d18e15 /lib | |
| parent | fdbfe97ca47f63c9b6425e3513f19862475d5257 (diff) | |
| parent | 392c48278507ef5ac43dd450725ce0ffb6b4d4ce (diff) | |
| download | rails-b24b7b9b76fa59eeddeb91b32b24d52e17f19a16.tar.gz rails-b24b7b9b76fa59eeddeb91b32b24d52e17f19a16.tar.bz2 rails-b24b7b9b76fa59eeddeb91b32b24d52e17f19a16.zip | |
Merge pull request #99 from seuros/resque
require both variant of resque-scheduler file
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/active_job/queue_adapters/resque_adapter.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/active_job/queue_adapters/resque_adapter.rb b/lib/active_job/queue_adapters/resque_adapter.rb index 9c223db15e..cddc4b5424 100644 --- a/lib/active_job/queue_adapters/resque_adapter.rb +++ b/lib/active_job/queue_adapters/resque_adapter.rb @@ -1,7 +1,11 @@ require 'resque' require 'active_support/core_ext/enumerable' require 'active_support/core_ext/array/access' -require 'resque-scheduler' +begin + require 'resque-scheduler' +rescue LoadError + require 'resque_scheduler' +end module ActiveJob module QueueAdapters |