Merge branch '113430903-delete_candidate_randomizer' into staging

This commit is contained in:
Stas 2016-04-07 12:11:35 +03:00
commit 75e547a876

View file

@ -96,7 +96,7 @@ class DomainCron
c = 0
Domain.where('delete_at <= ?', Time.zone.now).each do |x|
Domain.where('delete_at <= ?', Time.zone.now.end_of_day.utc).each do |x|
next unless x.delete_candidateable?
x.statuses << DomainStatus::DELETE_CANDIDATE
@ -110,7 +110,7 @@ class DomainCron
end
end
Domain.where('force_delete_at <= ?', Time.zone.now).each do |x|
Domain.where('force_delete_at <= ?', Time.zone.now.end_of_day.utc).each do |x|
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