From 0b10565d962f92e3a60ca3e0bf0e0a933125d690 Mon Sep 17 00:00:00 2001 From: David Genord II Date: Thu, 18 Sep 2014 15:52:30 -0400 Subject: Cleaner queuing of jobs using Delayed Job --- .../lib/active_job/queue_adapters/delayed_job_adapter.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'activejob/lib/active_job') diff --git a/activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb b/activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb index 30c535f3b4..8c1ac69cdc 100644 --- a/activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb +++ b/activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb @@ -5,16 +5,22 @@ module ActiveJob class DelayedJobAdapter class << self def enqueue(job) - JobWrapper.new.delay(queue: job.queue_name).perform(job.serialize) + Delayed::Job.enqueue(JobWrapper.new(job.serialize), queue: job.queue_name) end def enqueue_at(job, timestamp) - JobWrapper.new.delay(queue: job.queue_name, run_at: Time.at(timestamp)).perform(job.serialize) + Delayed::Job.enqueue(JobWrapper.new(job.serialize), queue: job.queue_name, run_at: Time.at(timestamp)) end end class JobWrapper #:nodoc: - def perform(job_data) + attr_accessor :job_data + + def initialize(job_data) + @job_data = job_data + end + + def perform Base.execute(job_data) end end -- cgit v1.2.3