aboutsummaryrefslogtreecommitdiffstats
path: root/lib/active_job/queue_adapters
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2014-05-22 20:37:06 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2014-05-22 20:37:06 +0200
commit26dc3ea7b8ac770b8265fa8ce97ed67158cfb68a (patch)
treef5eb36ae2efbb3a753c4dba5c0592a85e4544efa /lib/active_job/queue_adapters
parentef4aff07a41f1249baade695e68c75a8db3ded58 (diff)
downloadrails-26dc3ea7b8ac770b8265fa8ce97ed67158cfb68a.tar.gz
rails-26dc3ea7b8ac770b8265fa8ce97ed67158cfb68a.tar.bz2
rails-26dc3ea7b8ac770b8265fa8ce97ed67158cfb68a.zip
Rename #perform_with_hooks to #execution
Diffstat (limited to 'lib/active_job/queue_adapters')
-rw-r--r--lib/active_job/queue_adapters/backburner_adapter.rb2
-rw-r--r--lib/active_job/queue_adapters/delayed_job_adapter.rb2
-rw-r--r--lib/active_job/queue_adapters/inline_adapter.rb4
-rw-r--r--lib/active_job/queue_adapters/que_adapter.rb2
-rw-r--r--lib/active_job/queue_adapters/queue_classic_adapter.rb2
-rw-r--r--lib/active_job/queue_adapters/resque_adapter.rb2
-rw-r--r--lib/active_job/queue_adapters/sidekiq_adapter.rb2
-rw-r--r--lib/active_job/queue_adapters/sneakers_adapter.rb2
-rw-r--r--lib/active_job/queue_adapters/sucker_punch_adapter.rb2
9 files changed, 10 insertions, 10 deletions
diff --git a/lib/active_job/queue_adapters/backburner_adapter.rb b/lib/active_job/queue_adapters/backburner_adapter.rb
index b7e963cd6f..7a6032e56b 100644
--- a/lib/active_job/queue_adapters/backburner_adapter.rb
+++ b/lib/active_job/queue_adapters/backburner_adapter.rb
@@ -16,7 +16,7 @@ module ActiveJob
class JobWrapper
class << self
def perform(job_name, *args)
- job_name.constantize.new.perform_with_hooks *args
+ job_name.constantize.new.execute *args
end
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 fa08d779fb..c0561044be 100644
--- a/lib/active_job/queue_adapters/delayed_job_adapter.rb
+++ b/lib/active_job/queue_adapters/delayed_job_adapter.rb
@@ -15,7 +15,7 @@ module ActiveJob
class JobWrapper
def perform(job, *args)
- job.new.perform_with_hooks *args
+ job.new.execute *args
end
end
end
diff --git a/lib/active_job/queue_adapters/inline_adapter.rb b/lib/active_job/queue_adapters/inline_adapter.rb
index 8b82d7c25a..d116520285 100644
--- a/lib/active_job/queue_adapters/inline_adapter.rb
+++ b/lib/active_job/queue_adapters/inline_adapter.rb
@@ -3,7 +3,7 @@ module ActiveJob
class InlineAdapter
class << self
def enqueue(job, *args)
- job.new.perform_with_hooks *args
+ job.new.execute *args
end
def enqueue_at(job, timestamp, *args)
@@ -11,7 +11,7 @@ module ActiveJob
begin
interval = Time.now.to_f - timestamp
sleep(interval) if interval > 0
- job.new.perform_with_hooks *args
+ job.new.execute *args
rescue => e
ActiveJob::Base.logger.info "Error performing #{job}: #{e.message}"
end
diff --git a/lib/active_job/queue_adapters/que_adapter.rb b/lib/active_job/queue_adapters/que_adapter.rb
index adb9125666..3d30b2bc72 100644
--- a/lib/active_job/queue_adapters/que_adapter.rb
+++ b/lib/active_job/queue_adapters/que_adapter.rb
@@ -15,7 +15,7 @@ module ActiveJob
class JobWrapper < Que::Job
def run(job, *args)
- job.new.perform_with_hooks *args
+ job.new.execute *args
end
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 01d6d30caf..db7189f076 100644
--- a/lib/active_job/queue_adapters/queue_classic_adapter.rb
+++ b/lib/active_job/queue_adapters/queue_classic_adapter.rb
@@ -15,7 +15,7 @@ module ActiveJob
class JobWrapper
def self.perform(job, *args)
- job.new.perform_with_hooks *args
+ job.new.execute *args
end
end
end
diff --git a/lib/active_job/queue_adapters/resque_adapter.rb b/lib/active_job/queue_adapters/resque_adapter.rb
index 99da3c63ce..f7ed4669bd 100644
--- a/lib/active_job/queue_adapters/resque_adapter.rb
+++ b/lib/active_job/queue_adapters/resque_adapter.rb
@@ -19,7 +19,7 @@ module ActiveJob
class JobWrapper
class << self
def perform(job_name, *args)
- job_name.constantize.new.perform_with_hooks *args
+ job_name.constantize.new.execute *args
end
end
diff --git a/lib/active_job/queue_adapters/sidekiq_adapter.rb b/lib/active_job/queue_adapters/sidekiq_adapter.rb
index 2a2c2ce442..53e7b4d7fa 100644
--- a/lib/active_job/queue_adapters/sidekiq_adapter.rb
+++ b/lib/active_job/queue_adapters/sidekiq_adapter.rb
@@ -26,7 +26,7 @@ module ActiveJob
include Sidekiq::Worker
def perform(job_name, *args)
- job_name.constantize.new.perform_with_hooks *args
+ job_name.constantize.new.execute *args
end
end
end
diff --git a/lib/active_job/queue_adapters/sneakers_adapter.rb b/lib/active_job/queue_adapters/sneakers_adapter.rb
index ebd794fca1..3ca7745506 100644
--- a/lib/active_job/queue_adapters/sneakers_adapter.rb
+++ b/lib/active_job/queue_adapters/sneakers_adapter.rb
@@ -23,7 +23,7 @@ module ActiveJob
include Sneakers::Worker
def work(job, *args)
- job.new.perform_with_hooks *args
+ job.new.execute *args
end
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 a166081f9f..64b9c3ca15 100644
--- a/lib/active_job/queue_adapters/sucker_punch_adapter.rb
+++ b/lib/active_job/queue_adapters/sucker_punch_adapter.rb
@@ -17,7 +17,7 @@ module ActiveJob
include SuckerPunch::Job
def perform(job, *args)
- job.new.perform_with_hooks *args
+ job.new.execute *args
end
end
end