From 484dbd8ed6703a9ba89617ad92f9ffb7d0812d59 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Wed, 21 May 2014 01:07:45 +0200 Subject: Rename Adapter.queue and .queue_at to .enqueue and .enqueue_at for consistency. --- lib/active_job/enqueuing.rb | 4 ++-- lib/active_job/queue_adapters/backburner_adapter.rb | 4 ++-- lib/active_job/queue_adapters/delayed_job_adapter.rb | 4 ++-- lib/active_job/queue_adapters/inline_adapter.rb | 4 ++-- lib/active_job/queue_adapters/que_adapter.rb | 4 ++-- lib/active_job/queue_adapters/queue_classic_adapter.rb | 4 ++-- lib/active_job/queue_adapters/resque_adapter.rb | 4 ++-- lib/active_job/queue_adapters/sidekiq_adapter.rb | 4 ++-- lib/active_job/queue_adapters/sneakers_adapter.rb | 4 ++-- lib/active_job/queue_adapters/sucker_punch_adapter.rb | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) (limited to 'lib/active_job') diff --git a/lib/active_job/enqueuing.rb b/lib/active_job/enqueuing.rb index dd4556c237..dafa2399c8 100644 --- a/lib/active_job/enqueuing.rb +++ b/lib/active_job/enqueuing.rb @@ -12,7 +12,7 @@ module ActiveJob def enqueue(*args) serialized_args = Parameters.serialize(args) ActiveSupport::Notifications.instrument "enqueue.active_job", adapter: queue_adapter, job: self, args: serialized_args - queue_adapter.queue self, *serialized_args + queue_adapter.enqueue self, *serialized_args end # Enqueue a job to be performed at +interval+ from now. @@ -33,7 +33,7 @@ module ActiveJob timestamp = timestamp.to_f serialized_args = Parameters.serialize(args) ActiveSupport::Notifications.instrument "enqueue_at.active_job", adapter: queue_adapter, job: self, args: serialized_args, timestamp: timestamp - queue_adapter.queue_at self, timestamp, *serialized_args + queue_adapter.enqueue_at self, timestamp, *serialized_args end end end diff --git a/lib/active_job/queue_adapters/backburner_adapter.rb b/lib/active_job/queue_adapters/backburner_adapter.rb index 12760316f0..5230acc625 100644 --- a/lib/active_job/queue_adapters/backburner_adapter.rb +++ b/lib/active_job/queue_adapters/backburner_adapter.rb @@ -4,11 +4,11 @@ module ActiveJob module QueueAdapters class BackburnerAdapter class << self - def queue(job, *args) + def enqueue(job, *args) Backburner::Worker.enqueue JobWrapper, [ job.name, *args ], queue: job.queue_name end - def queue_at(job, timestamp, *args) + def enqueue_at(job, timestamp, *args) raise NotImplementedError end end diff --git a/lib/active_job/queue_adapters/delayed_job_adapter.rb b/lib/active_job/queue_adapters/delayed_job_adapter.rb index db7b8a5528..5a9c4c708d 100644 --- a/lib/active_job/queue_adapters/delayed_job_adapter.rb +++ b/lib/active_job/queue_adapters/delayed_job_adapter.rb @@ -4,11 +4,11 @@ module ActiveJob module QueueAdapters class DelayedJobAdapter class << self - def queue(job, *args) + def enqueue(job, *args) JobWrapper.new.delay(queue: job.queue_name).perform(job, *args) end - def queue_at(job, timestamp, *args) + def enqueue_at(job, timestamp, *args) JobWrapper.new.delay(queue: job.queue_name, run_at: timestamp).perform(job, *args) end end diff --git a/lib/active_job/queue_adapters/inline_adapter.rb b/lib/active_job/queue_adapters/inline_adapter.rb index 8f790943c4..d826ce51b4 100644 --- a/lib/active_job/queue_adapters/inline_adapter.rb +++ b/lib/active_job/queue_adapters/inline_adapter.rb @@ -2,11 +2,11 @@ module ActiveJob module QueueAdapters class InlineAdapter class << self - def queue(job, *args) + def enqueue(job, *args) job.new.perform_with_deserialization *args end - def queue_at(job, timestamp, *args) + def enqueue_at(job, timestamp, *args) Thread.new do begin interval = Time.now.to_f - timestamp diff --git a/lib/active_job/queue_adapters/que_adapter.rb b/lib/active_job/queue_adapters/que_adapter.rb index 30a69dbd64..9dd57d65f3 100644 --- a/lib/active_job/queue_adapters/que_adapter.rb +++ b/lib/active_job/queue_adapters/que_adapter.rb @@ -4,11 +4,11 @@ module ActiveJob module QueueAdapters class QueAdapter class << self - def queue(job, *args) + def enqueue(job, *args) JobWrapper.enqueue job, *args, queue: job.queue_name end - def queue_at(job, timestamp, *args) + def enqueue_at(job, timestamp, *args) raise NotImplementedError end end diff --git a/lib/active_job/queue_adapters/queue_classic_adapter.rb b/lib/active_job/queue_adapters/queue_classic_adapter.rb index 762b0370d5..eacc6b5548 100644 --- a/lib/active_job/queue_adapters/queue_classic_adapter.rb +++ b/lib/active_job/queue_adapters/queue_classic_adapter.rb @@ -4,11 +4,11 @@ module ActiveJob module QueueAdapters class QueueClassicAdapter class << self - def queue(job, *args) + def enqueue(job, *args) QC::Queue.new(job.queue_name).enqueue("#{JobWrapper.name}.perform", job, *args) end - def queue_at(job, timestamp, *args) + def enqueue_at(job, timestamp, *args) raise NotImplementedError end end diff --git a/lib/active_job/queue_adapters/resque_adapter.rb b/lib/active_job/queue_adapters/resque_adapter.rb index f16d546c3c..3b87f25b80 100644 --- a/lib/active_job/queue_adapters/resque_adapter.rb +++ b/lib/active_job/queue_adapters/resque_adapter.rb @@ -7,11 +7,11 @@ module ActiveJob module QueueAdapters class ResqueAdapter class << self - def queue(job, *args) + def enqueue(job, *args) Resque.enqueue JobWrapper.new(job), job, *args end - def queue_at(job, timestamp, *args) + def enqueue_at(job, timestamp, *args) Resque.enqueue_at timestamp, JobWrapper.new(job), job, *args end end diff --git a/lib/active_job/queue_adapters/sidekiq_adapter.rb b/lib/active_job/queue_adapters/sidekiq_adapter.rb index 15cfd22bf5..74fbe632d6 100644 --- a/lib/active_job/queue_adapters/sidekiq_adapter.rb +++ b/lib/active_job/queue_adapters/sidekiq_adapter.rb @@ -4,7 +4,7 @@ module ActiveJob module QueueAdapters class SidekiqAdapter class << self - def queue(job, *args) + def enqueue(job, *args) Sidekiq::Client.push \ 'class' => JobWrapper, 'queue' => job.queue_name, @@ -12,7 +12,7 @@ module ActiveJob 'retry' => true end - def queue_at(job, timestamp, *args) + def enqueue_at(job, timestamp, *args) Sidekiq::Client.push \ 'class' => JobWrapper, 'queue' => job.queue_name, diff --git a/lib/active_job/queue_adapters/sneakers_adapter.rb b/lib/active_job/queue_adapters/sneakers_adapter.rb index 91be8790dd..6bb575e907 100644 --- a/lib/active_job/queue_adapters/sneakers_adapter.rb +++ b/lib/active_job/queue_adapters/sneakers_adapter.rb @@ -7,14 +7,14 @@ module ActiveJob @mutex = Mutex.new class << self - def queue(job, *args) + def enqueue(job, *args) @mutex.synchronize do JobWrapper.from_queue job.queue_name JobWrapper.enqueue [ job, *args ] end end - def queue_at(job, timestamp, *args) + def enqueue_at(job, timestamp, *args) raise NotImplementedError end end diff --git a/lib/active_job/queue_adapters/sucker_punch_adapter.rb b/lib/active_job/queue_adapters/sucker_punch_adapter.rb index 22bf3ed799..30718fc05f 100644 --- a/lib/active_job/queue_adapters/sucker_punch_adapter.rb +++ b/lib/active_job/queue_adapters/sucker_punch_adapter.rb @@ -4,11 +4,11 @@ module ActiveJob module QueueAdapters class SuckerPunchAdapter class << self - def queue(job, *args) + def enqueue(job, *args) JobWrapper.new.async.perform job, *args end - def queue_at(job, timestamp, *args) + def enqueue_at(job, timestamp, *args) raise NotImplementedError end end -- cgit v1.2.3