From aa1e08942b48c785d7cdb8313be3d2480b485afd Mon Sep 17 00:00:00 2001 From: Stas Date: Fri, 4 Mar 2016 12:47:39 +0200 Subject: [PATCH] 113430903-minutes_added_for_condition --- app/jobs/domain_set_delete_candidate_job.rb | 2 +- app/models/domain_cron.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/jobs/domain_set_delete_candidate_job.rb b/app/jobs/domain_set_delete_candidate_job.rb index ffdf54277..cc6f3f255 100644 --- a/app/jobs/domain_set_delete_candidate_job.rb +++ b/app/jobs/domain_set_delete_candidate_job.rb @@ -4,6 +4,6 @@ class DomainSetDeleteCandidateJob < Que::Job domain = Domain.find(domain_id) domain.statuses << DomainStatus::DELETE_CANDIDATE domain.save(validate: false) - DomainDeleteJob.enqueue(domain.id, run_at: rand(((24*60) - (DateTime.now.hour * 60))).minutes.from_now) + DomainDeleteJob.enqueue(domain.id, run_at: rand(((24*60) - (DateTime.now.hour * 60 + DateTime.now.minute))).minutes.from_now) end end diff --git a/app/models/domain_cron.rb b/app/models/domain_cron.rb index d4e26f10a..24c0aac74 100644 --- a/app/models/domain_cron.rb +++ b/app/models/domain_cron.rb @@ -75,7 +75,7 @@ class DomainCron next unless domain.delete_candidateable? real += 1 STDOUT << "#{Time.zone.now.utc} DomainCron.start_delete_period: ##{domain.id} (#{domain.name})\n" unless Rails.env.test? - DomainSetDeleteCandidateJob.enqueue(domain.id, run_at: rand(((24*60) - (DateTime.now.hour * 60))).minutes.from_now) and marked += 1 + DomainSetDeleteCandidateJob.enqueue(domain.id, run_at: rand(((24*60) - (DateTime.now.hour * 60 + DateTime.now.minute))).minutes.from_now) and marked += 1 end ensure # the operator should see what was accomplished STDOUT << "#{Time.zone.now.utc} - Finished setting schedule for delete_candidate - #{marked} out of #{real} successfully added to Que schedule\n" unless Rails.env.test? @@ -88,7 +88,7 @@ class DomainCron c = 0 Domain.where('force_delete_at <= ?', Time.zone.now).each do |x| - DomainDeleteJob.enqueue(x.id, run_at: rand(((24*60) - (DateTime.now.hour * 60))).minutes.from_now) + DomainDeleteJob.enqueue(x.id, run_at: rand(((24*60) - (DateTime.now.hour * 60 + DateTime.now.minute))).minutes.from_now) STDOUT << "#{Time.zone.now.utc} DomainCron.destroy_delete_candidates: job added by force delete time ##{x.id} (#{x.name})\n" unless Rails.env.test? c += 1 end