Merge branch 'master' of github.com:domify/registry

This commit is contained in:
Priit Tark 2015-06-10 14:22:57 +03:00
commit 07334f9cf6

View file

@ -148,40 +148,41 @@ class Domain < ActiveRecord::Base
end end
def start_expire_period def start_expire_period
logger.info "#{Time.zone.now.utc} - Expiring domains\n" STDOUT << "#{Time.zone.now.utc} - Expiring domains\n" unless Rails.env.test?
d = Domain.where('valid_to <= ?', Time.zone.now) d = Domain.where('valid_to <= ?', Time.zone.now)
d.each do |x| d.each do |x|
x.domain_statuses.create(value: DomainStatus::EXPIRED) if x.expirable? x.domain_statuses.create(value: DomainStatus::EXPIRED) if x.expirable?
end end
logger.info "#{Time.zone.now.utc} - Successfully expired #{d.count} domains\n" STDOUT << "#{Time.zone.now.utc} - Successfully expired #{d.count} domains\n" unless Rails.env.test?
end end
def start_redemption_grace_period def start_redemption_grace_period
logger.info "#{Time.zone.now.utc} - Setting server_hold to domains\n" STDOUT << "#{Time.zone.now.utc} - Setting server_hold to domains\n" unless Rails.env.test?
d = Domain.where('outzone_at <= ?', Time.zone.now) d = Domain.where('outzone_at <= ?', Time.zone.now)
d.each do |x| d.each do |x|
x.domain_statuses.create(value: DomainStatus::SERVER_HOLD) if x.server_holdable? x.domain_statuses.create(value: DomainStatus::SERVER_HOLD) if x.server_holdable?
end end
logger.info "#{Time.zone.now.utc} - Successfully set server_hold to #{d.count} domains\n" STDOUT << "#{Time.zone.now.utc} - Successfully set server_hold to #{d.count} domains\n" unless Rails.env.test?
end end
def start_delete_period def start_delete_period
logger.info "#{Time.zone.now.utc} - Setting delete_candidate to domains\n" STDOUT << "#{Time.zone.now.utc} - Setting delete_candidate to domains\n" unless Rails.env.test?
d = Domain.where('delete_at <= ?', Time.zone.now) d = Domain.where('delete_at <= ?', Time.zone.now)
d.each do |x| d.each do |x|
x.domain_statuses.create(value: DomainStatus::DELETE_CANDIDATE) if x.delete_candidateable? x.domain_statuses.create(value: DomainStatus::DELETE_CANDIDATE) if x.delete_candidateable?
end end
logger.info "#{Time.zone.now.utc} - Successfully set delete_candidate to #{d.count} domains\n" return if Rails.env.test?
STDOUT << "#{Time.zone.now.utc} - Successfully set delete_candidate to #{d.count} domains\n"
end end
def destroy_delete_candidates def destroy_delete_candidates
logger.info "#{Time.zone.now.utc} - Destroying domains\n" STDOUT << "#{Time.zone.now.utc} - Destroying domains\n" unless Rails.env.test?
c = 0 c = 0
DomainStatus.where(value: DomainStatus::DELETE_CANDIDATE).each do |x| DomainStatus.where(value: DomainStatus::DELETE_CANDIDATE).each do |x|
@ -189,7 +190,7 @@ class Domain < ActiveRecord::Base
c += 1 c += 1
end end
logger.info "#{Time.zone.now.utc} - Successfully destroyed #{c} domains\n" STDOUT << "#{Time.zone.now.utc} - Successfully destroyed #{c} domains\n" unless Rails.env.test?
end end
end end