aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2014-05-18 13:11:00 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2014-05-18 13:11:00 +0200
commiteed52c8808fceb0004e488f77f0bc6904f7aaddf (patch)
tree1813d45e25e5f94552f809c1eebba5b83e93c83c /lib
parent30973e35a0271ed0cfab524a017a0e77d34352b6 (diff)
downloadrails-eed52c8808fceb0004e488f77f0bc6904f7aaddf.tar.gz
rails-eed52c8808fceb0004e488f77f0bc6904f7aaddf.tar.bz2
rails-eed52c8808fceb0004e488f77f0bc6904f7aaddf.zip
Add ResqueAdapter and provide test infrastructure for the now multiple adapters
Diffstat (limited to 'lib')
-rw-r--r--lib/active_job/base.rb7
-rw-r--r--lib/active_job/queue_adapters/resque_adapter.rb (renamed from lib/active_job/queue_adapters/inline_queue.rb)6
2 files changed, 9 insertions, 4 deletions
diff --git a/lib/active_job/base.rb b/lib/active_job/base.rb
index a404355026..e18c9d4309 100644
--- a/lib/active_job/base.rb
+++ b/lib/active_job/base.rb
@@ -1,10 +1,13 @@
-require 'active_job/queue_adapters/inline_queue'
+require 'active_job/queue_adapters/inline_adapter'
+require 'active_job/queue_adapters/resque_adapter'
module ActiveJob
class Base
+ cattr_accessor(:queue_adapter) { ActiveJob::QueueAdapters::InlineAdapter }
+
class << self
def enqueue(*args)
- ActiveJob::QueueAdapters::InlineQueue.queue self, *args
+ queue_adapter.queue self, *args
end
end
end
diff --git a/lib/active_job/queue_adapters/inline_queue.rb b/lib/active_job/queue_adapters/resque_adapter.rb
index dd80c6a5a3..4155cd5bf9 100644
--- a/lib/active_job/queue_adapters/inline_queue.rb
+++ b/lib/active_job/queue_adapters/resque_adapter.rb
@@ -1,9 +1,11 @@
+require 'resque'
+
module ActiveJob
module QueueAdapters
- class InlineQueue
+ class ResqueAdapter
class << self
def queue(job, *args)
- job.perform *args
+ Resque.enqueue(job, *args)
end
end
end