From 392c48278507ef5ac43dd450725ce0ffb6b4d4ce Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Thu, 3 Jul 2014 16:44:01 +0000 Subject: require both variant of resque-scheduler --- lib/active_job/queue_adapters/resque_adapter.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib') 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 -- cgit v1.2.3