kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #33568 from mohitnatoo/perform-or-enqueue

Browse source 
perform_or_enqueue instead of enqueue_or_perform
This commit is contained in:
George Claghorn 2018-08-09 22:08:36 -04:00 committed by GitHub
commit 924f443716
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
activejob/lib/active_job/queue_adapters/test_adapter.rb
View file

@ -29,14 +29,14 @@ module ActiveJob
return if filtered?(job) return if filtered?(job)
job_data = job_to_hash(job) job_data = job_to_hash(job)
enqueue_or_perform(perform_enqueued_jobs, job, job_data) perform_or_enqueue(perform_enqueued_jobs, job, job_data)
end end
def enqueue_at(job, timestamp) #:nodoc: def enqueue_at(job, timestamp) #:nodoc:
return if filtered?(job) return if filtered?(job)
job_data = job_to_hash(job, at: timestamp) job_data = job_to_hash(job, at: timestamp)
enqueue_or_perform(perform_enqueued_at_jobs, job, job_data) perform_or_enqueue(perform_enqueued_at_jobs, job, job_data)
end end
private private
@ -44,7 +44,7 @@ module ActiveJob
{ job: job.class, args: job.serialize.fetch("arguments"), queue: job.queue_name }.merge!(extras) { job: job.class, args: job.serialize.fetch("arguments"), queue: job.queue_name }.merge!(extras)
end end
def enqueue_or_perform(perform, job, job_data) def perform_or_enqueue(perform, job, job_data)
if perform if perform
performed_jobs << job_data performed_jobs << job_data
Base.execute job.serialize Base.execute job.serialize