Merge pull request #1993 from internetee/fix-array-argument-in-job

Fix DomainExpireEmailJob migration
This commit is contained in:
Alex Sherman 2021-05-19 12:34:25 +05:00 committed by GitHub
commit 4199acdf00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions

View file

@ -1,7 +1,8 @@
class DomainExpireEmailJob < ApplicationJob class DomainExpireEmailJob < ApplicationJob
def perform(domain_id, email) def perform(domain_id, email)
domain = Domain.find(domain_id) domain = Domain.find_by(id: domain_id)
return if domain.blank?
return if domain.registered? return if domain.registered?
attrs = { attrs = {

View file

@ -18,12 +18,14 @@ namespace :migrate_jobs do
else else
args = que_job.args args = que_job.args
time = que_job.run_at time = que_job.run_at
time = Time.zone.now + 1.minute if time < Time.zone.now
que_job.job_class.constantize.set(wait_until: time).perform_later(args) que_job.job_class.constantize.set(wait_until: time).perform_later(*args)
end end
end end
def skip_condition(que_job) def skip_condition(que_job)
que_job.last_error.present? || !(que_job.job_class.constantize < ApplicationJob) que_job.last_error.present? || !(que_job.job_class.constantize < ApplicationJob) ||
!(que_job.job_class == 'DomainExpireEmailJob')
end end
end end