From bd65eb64948fcd08c352db2fdbd6bb610d9d2e10 Mon Sep 17 00:00:00 2001 From: Stas Date: Tue, 12 Jan 2016 13:05:12 +0200 Subject: [PATCH 1/6] 110395650-separated_class_for_cron_jobs --- app/models/domain.rb | 128 ++++++++----------------------------- app/models/domain_cron.rb | 98 ++++++++++++++++++++++++++++ config/schedule.rb | 10 +-- spec/models/domain_spec.rb | 30 ++++----- 4 files changed, 143 insertions(+), 123 deletions(-) create mode 100644 app/models/domain_cron.rb diff --git a/app/models/domain.rb b/app/models/domain.rb index a9defdf50..5b3a6cd65 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -203,6 +203,31 @@ class Domain < ActiveRecord::Base statuses.include? DomainStatus::SERVER_TECH_CHANGE_PROHIBITED end + def self.clean_expired_pendings + DomainCron.send(__method__) + ActiveSupport::Deprecation.deprecate_methods(DomainCron, __method__) + end + + def self.start_expire_period + DomainCron.send(__method__) + ActiveSupport::Deprecation.deprecate_methods(DomainCron, __method__) + end + + def self.start_redemption_grace_period + DomainCron.send(__method__) + ActiveSupport::Deprecation.deprecate_methods(DomainCron, __method__) + end + + def self.start_delete_period + DomainCron.send(__method__) + ActiveSupport::Deprecation.deprecate_methods(DomainCron, __method__) + end + + def self.destroy_delete_candidates + DomainCron.send(__method__) + ActiveSupport::Deprecation.deprecate_methods(DomainCron, __method__) + end + class << self def convert_period_to_time(period, unit) return (period.to_i / 365).years if unit == 'd' @@ -221,109 +246,6 @@ class Domain < ActiveRecord::Base ) end - # rubocop: disable Metrics/AbcSize - # rubocop: disable Metrics/CyclomaticComplexity - # rubocop: disable Metrics/PerceivedComplexity - def clean_expired_pendings - STDOUT << "#{Time.zone.now.utc} - Clean expired domain pendings\n" unless Rails.env.test? - - expire_at = Setting.expire_pending_confirmation.hours.ago - count = 0 - expired_pending_domains = Domain.where('registrant_verification_asked_at <= ?', expire_at) - expired_pending_domains.each do |domain| - unless domain.pending_update? || domain.pending_delete? || domain.pending_delete_confirmation? - msg = "#{Time.zone.now.utc} - ISSUE: DOMAIN #{domain.id}: #{domain.name} IS IN EXPIRED PENDING LIST, " \ - "but no pendingDelete/pendingUpdate state present!\n" - STDOUT << msg unless Rails.env.test? - next - end - count += 1 - if domain.pending_update? - domain.send_mail :pending_update_expired_notification_for_new_registrant - end - if domain.pending_delete? || domain.pending_delete_confirmation? - DomainMailer.pending_delete_expired_notification(domain.id, true).deliver - end - domain.clean_pendings! - unless Rails.env.test? - STDOUT << "#{Time.zone.now.utc} Domain.clean_expired_pendings: ##{domain.id} (#{domain.name})\n" - end - end - STDOUT << "#{Time.zone.now.utc} - Successfully cancelled #{count} domain pendings\n" unless Rails.env.test? - count - end - # rubocop: enable Metrics/PerceivedComplexity - # rubocop: enable Metrics/AbcSize - # rubocop: enable Metrics/CyclomaticComplexity - - # rubocop: disable Metrics/LineLength - def start_expire_period - STDOUT << "#{Time.zone.now.utc} - Expiring domains\n" unless Rails.env.test? - - domains = Domain.where('valid_to <= ?', Time.zone.now) - domains.each do |domain| - next unless domain.expirable? - domain.set_graceful_expired - DomainMailer.expiration_reminder(domain.id).deliver - STDOUT << "#{Time.zone.now.utc} Domain.start_expire_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? - domain.save - end - - STDOUT << "#{Time.zone.now.utc} - Successfully expired #{domains.count} domains\n" unless Rails.env.test? - end - - def start_redemption_grace_period - STDOUT << "#{Time.zone.now.utc} - Setting server_hold to domains\n" unless Rails.env.test? - - d = Domain.where('outzone_at <= ?', Time.zone.now) - d.each do |domain| - next unless domain.server_holdable? - domain.statuses << DomainStatus::SERVER_HOLD - STDOUT << "#{Time.zone.now.utc} Domain.start_redemption_grace_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? - domain.save - end - - STDOUT << "#{Time.zone.now.utc} - Successfully set server_hold to #{d.count} domains\n" unless Rails.env.test? - end - - def start_delete_period - STDOUT << "#{Time.zone.now.utc} - Setting delete_candidate to domains\n" unless Rails.env.test? - - d = Domain.where('delete_at <= ?', Time.zone.now) - d.each do |domain| - next unless domain.delete_candidateable? - domain.statuses << DomainStatus::DELETE_CANDIDATE - STDOUT << "#{Time.zone.now.utc} Domain.start_delete_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? - domain.save - end - - return if Rails.env.test? - STDOUT << "#{Time.zone.now.utc} - Successfully set delete_candidate to #{d.count} domains\n" - end - - # rubocop:disable Rails/FindEach - # rubocop:disable Metrics/AbcSize - def destroy_delete_candidates - STDOUT << "#{Time.zone.now.utc} - Destroying domains\n" unless Rails.env.test? - - c = 0 - Domain.where("statuses @> '{deleteCandidate}'::varchar[]").each do |x| - WhoisRecord.where(domain_id: x.id).destroy_all - destroy_with_message x - STDOUT << "#{Time.zone.now.utc} Domain.destroy_delete_candidates: by deleteCandidate ##{x.id} (#{x.name})\n" unless Rails.env.test? - - c += 1 - end - - Domain.where('force_delete_at <= ?', Time.zone.now).each do |x| - WhoisRecord.where(domain_id: x.id).destroy_all - destroy_with_message x - STDOUT << "#{Time.zone.now.utc} Domain.destroy_delete_candidates: by force delete time ##{x.id} (#{x.name})\n" unless Rails.env.test? - c += 1 - end - - STDOUT << "#{Time.zone.now.utc} - Successfully destroyed #{c} domains\n" unless Rails.env.test? - end # rubocop: enable Metrics/AbcSize # rubocop:enable Rails/FindEach # rubocop: enable Metrics/LineLength diff --git a/app/models/domain_cron.rb b/app/models/domain_cron.rb new file mode 100644 index 000000000..3fd09dc1f --- /dev/null +++ b/app/models/domain_cron.rb @@ -0,0 +1,98 @@ +class DomainCron + + def self.clean_expired_pendings + STDOUT << "#{Time.zone.now.utc} - Clean expired domain pendings\n" unless Rails.env.test? + + expire_at = Setting.expire_pending_confirmation.hours.ago + count = 0 + expired_pending_domains = Domain.where('registrant_verification_asked_at <= ?', expire_at) + expired_pending_domains.each do |domain| + unless domain.pending_update? || domain.pending_delete? || domain.pending_delete_confirmation? + msg = "#{Time.zone.now.utc} - ISSUE: DOMAIN #{domain.id}: #{domain.name} IS IN EXPIRED PENDING LIST, " \ + "but no pendingDelete/pendingUpdate state present!\n" + STDOUT << msg unless Rails.env.test? + next + end + count += 1 + if domain.pending_update? + domain.send_mail :pending_update_expired_notification_for_new_registrant + end + if domain.pending_delete? || domain.pending_delete_confirmation? + DomainMailer.pending_delete_expired_notification(domain.id, true).deliver + end + domain.clean_pendings! + unless Rails.env.test? + STDOUT << "#{Time.zone.now.utc} Domain.clean_expired_pendings: ##{domain.id} (#{domain.name})\n" + end + end + STDOUT << "#{Time.zone.now.utc} - Successfully cancelled #{count} domain pendings\n" unless Rails.env.test? + count + end + + def self.start_expire_period + STDOUT << "#{Time.zone.now.utc} - Expiring domains\n" unless Rails.env.test? + + domains = Domain.where('valid_to <= ?', Time.zone.now) + domains.each do |domain| + next unless domain.expirable? + domain.set_graceful_expired + DomainMailer.expiration_reminder(domain.id).deliver + STDOUT << "#{Time.zone.now.utc} Domain.start_expire_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? + domain.save + end + + STDOUT << "#{Time.zone.now.utc} - Successfully expired #{domains.count} domains\n" unless Rails.env.test? + end + + def self.start_redemption_grace_period + STDOUT << "#{Time.zone.now.utc} - Setting server_hold to domains\n" unless Rails.env.test? + + d = Domain.where('outzone_at <= ?', Time.zone.now) + d.each do |domain| + next unless domain.server_holdable? + domain.statuses << DomainStatus::SERVER_HOLD + STDOUT << "#{Time.zone.now.utc} Domain.start_redemption_grace_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? + domain.save + end + + STDOUT << "#{Time.zone.now.utc} - Successfully set server_hold to #{d.count} domains\n" unless Rails.env.test? + end + + def self.start_delete_period + STDOUT << "#{Time.zone.now.utc} - Setting delete_candidate to domains\n" unless Rails.env.test? + + d = Domain.where('delete_at <= ?', Time.zone.now) + d.each do |domain| + next unless domain.delete_candidateable? + domain.statuses << DomainStatus::DELETE_CANDIDATE + STDOUT << "#{Time.zone.now.utc} Domain.start_delete_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? + domain.save + end + + return if Rails.env.test? + STDOUT << "#{Time.zone.now.utc} - Successfully set delete_candidate to #{d.count} domains\n" + end + + def self.destroy_delete_candidates + STDOUT << "#{Time.zone.now.utc} - Destroying domains\n" unless Rails.env.test? + + c = 0 + Domain.where("statuses @> '{deleteCandidate}'::varchar[]").each do |x| + WhoisRecord.where(domain_id: x.id).destroy_all + destroy_with_message x + STDOUT << "#{Time.zone.now.utc} Domain.destroy_delete_candidates: by deleteCandidate ##{x.id} (#{x.name})\n" unless Rails.env.test? + + c += 1 + end + + Domain.where('force_delete_at <= ?', Time.zone.now).each do |x| + WhoisRecord.where(domain_id: x.id).destroy_all + destroy_with_message x + STDOUT << "#{Time.zone.now.utc} Domain.destroy_delete_candidates: by force delete time ##{x.id} (#{x.name})\n" unless Rails.env.test? + c += 1 + end + + STDOUT << "#{Time.zone.now.utc} - Successfully destroyed #{c} domains\n" unless Rails.env.test? + end + +end diff --git a/config/schedule.rb b/config/schedule.rb index 5524f10ab..81f11c341 100644 --- a/config/schedule.rb +++ b/config/schedule.rb @@ -31,7 +31,7 @@ if @cron_group == 'registry' # end every :day, at: '12:20am' do - runner 'Domain.clean_expired_pendings' + runner 'DomainCron.clean_expired_pendings' end every 3.hours do @@ -39,19 +39,19 @@ if @cron_group == 'registry' end every 42.minutes do - runner 'Domain.destroy_delete_candidates' + runner 'DomainCron.destroy_delete_candidates' end every 45.minutes do - runner 'Domain.start_expire_period' + runner 'DomainCron.start_expire_period' end every 50.minutes do - runner 'Domain.start_delete_period' + runner 'DomainCron.start_delete_period' end every 52.minutes do - runner 'Domain.start_redemption_grace_period' + runner 'DomainCron.start_redemption_grace_period' end end diff --git a/spec/models/domain_spec.rb b/spec/models/domain_spec.rb index 9dd0f1a48..cddb9141b 100644 --- a/spec/models/domain_spec.rb +++ b/spec/models/domain_spec.rb @@ -140,20 +140,20 @@ describe Domain do domain.registrant_verification_asked_at = 30.days.ago domain.pending_delete! - Domain.clean_expired_pendings.should == 1 + DomainCron.clean_expired_pendings.should == 1 domain.reload.pending_delete?.should == false domain.pending_json.should == {} end it 'should expire domains' do - Domain.start_expire_period + DomainCron.start_expire_period @domain.statuses.include?(DomainStatus::EXPIRED).should == false old_valid_to = Time.zone.now - 10.days @domain.valid_to = old_valid_to @domain.save - Domain.start_expire_period + DomainCron.start_expire_period @domain.reload @domain.statuses.include?(DomainStatus::EXPIRED).should == true @domain.outzone_at.should be_within(5).of(old_valid_to + Setting.expire_warning_period.days) @@ -161,7 +161,7 @@ describe Domain do old_valid_to + Setting.expire_warning_period.days + Setting.redemption_grace_period.days ) - Domain.start_expire_period + DomainCron.start_expire_period @domain.reload @domain.statuses.include?(DomainStatus::EXPIRED).should == true end @@ -173,7 +173,7 @@ describe Domain do @domain.outzone_at, @domain.delete_at = nil, nil @domain.save - Domain.start_expire_period + DomainCron.start_expire_period @domain.reload @domain.statuses.include?(DomainStatus::EXPIRED).should == true @domain.outzone_at.should be_within(5).of(old_valid_to + Setting.expire_warning_period.days) @@ -183,7 +183,7 @@ describe Domain do end it 'should start redemption grace period' do - Domain.start_redemption_grace_period + DomainCron.start_redemption_grace_period @domain.reload @domain.statuses.include?(DomainStatus::SERVER_HOLD).should == false @@ -191,20 +191,20 @@ describe Domain do @domain.statuses << DomainStatus::SERVER_MANUAL_INZONE # this prohibits server_hold @domain.save - Domain.start_redemption_grace_period + DomainCron.start_redemption_grace_period @domain.reload @domain.statuses.include?(DomainStatus::SERVER_HOLD).should == false @domain.statuses = [] @domain.save - Domain.start_redemption_grace_period + DomainCron.start_redemption_grace_period @domain.reload @domain.statuses.include?(DomainStatus::SERVER_HOLD).should == true end it 'should start delete period' do - Domain.start_delete_period + DomainCron.start_delete_period @domain.reload @domain.statuses.include?(DomainStatus::DELETE_CANDIDATE).should == false @@ -212,13 +212,13 @@ describe Domain do @domain.statuses << DomainStatus::SERVER_DELETE_PROHIBITED # this prohibits delete_candidate @domain.save - Domain.start_delete_period + DomainCron.start_delete_period @domain.reload @domain.statuses.include?(DomainStatus::DELETE_CANDIDATE).should == false @domain.statuses = [] @domain.save - Domain.start_delete_period + DomainCron.start_delete_period @domain.reload @domain.statuses.include?(DomainStatus::DELETE_CANDIDATE).should == true @@ -234,7 +234,7 @@ describe Domain do Domain.count.should == 2 - Domain.start_delete_period + DomainCron.start_delete_period Domain.destroy_delete_candidates Domain.count.should == 0 @@ -391,7 +391,7 @@ describe Domain do end it 'should start redemption grace period' do - Domain.start_redemption_grace_period + DomainCron.start_redemption_grace_period @domain.reload @domain.statuses.include?(DomainStatus::SERVER_HOLD).should == false @@ -399,14 +399,14 @@ describe Domain do @domain.statuses << DomainStatus::SERVER_MANUAL_INZONE # this prohibits server_hold @domain.save - Domain.start_redemption_grace_period + DomainCron.start_redemption_grace_period @domain.reload @domain.statuses.include?(DomainStatus::SERVER_HOLD).should == false @domain.statuses = [] @domain.save - Domain.start_redemption_grace_period + DomainCron.start_redemption_grace_period @domain.reload @domain.statuses.include?(DomainStatus::SERVER_HOLD).should == true end From 0b5fdcf3c2fe12d4f515494692d7ef20f1413541 Mon Sep 17 00:00:00 2001 From: Stas Date: Wed, 13 Jan 2016 19:08:10 +0200 Subject: [PATCH 2/6] 110395650-method_changes --- app/models/domain_cron.rb | 45 ++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/app/models/domain_cron.rb b/app/models/domain_cron.rb index 3fd09dc1f..9e2540c9c 100644 --- a/app/models/domain_cron.rb +++ b/app/models/domain_cron.rb @@ -15,10 +15,10 @@ class DomainCron end count += 1 if domain.pending_update? - domain.send_mail :pending_update_expired_notification_for_new_registrant + DomainMailer.pending_update_expired_notification_for_new_registrant(domain.id).deliver end if domain.pending_delete? || domain.pending_delete_confirmation? - DomainMailer.pending_delete_expired_notification(domain.id, true).deliver + DomainMailer.pending_delete_expired_notification(domain.id, deliver_emails).deliver end domain.clean_pendings! unless Rails.env.test? @@ -33,44 +33,55 @@ class DomainCron STDOUT << "#{Time.zone.now.utc} - Expiring domains\n" unless Rails.env.test? domains = Domain.where('valid_to <= ?', Time.zone.now) + marked = 0 + real = 0 domains.each do |domain| next unless domain.expirable? + real += 1 domain.set_graceful_expired - DomainMailer.expiration_reminder(domain.id).deliver STDOUT << "#{Time.zone.now.utc} Domain.start_expire_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? - domain.save + domain.save and marked += 1 end - STDOUT << "#{Time.zone.now.utc} - Successfully expired #{domains.count} domains\n" unless Rails.env.test? + STDOUT << "#{Time.zone.now.utc} - Successfully expired #{marked} of #{real} domains\n" unless Rails.env.test? end def self.start_redemption_grace_period STDOUT << "#{Time.zone.now.utc} - Setting server_hold to domains\n" unless Rails.env.test? d = Domain.where('outzone_at <= ?', Time.zone.now) + marked = 0 + real = 0 d.each do |domain| next unless domain.server_holdable? + real += 1 domain.statuses << DomainStatus::SERVER_HOLD STDOUT << "#{Time.zone.now.utc} Domain.start_redemption_grace_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? - domain.save + domain.save and marked += 1 end - STDOUT << "#{Time.zone.now.utc} - Successfully set server_hold to #{d.count} domains\n" unless Rails.env.test? + STDOUT << "#{Time.zone.now.utc} - Successfully set server_hold to #{marked} of #{real} domains\n" unless Rails.env.test? + marked end def self.start_delete_period - STDOUT << "#{Time.zone.now.utc} - Setting delete_candidate to domains\n" unless Rails.env.test? + begin + STDOUT << "#{Time.zone.now.utc} - Setting delete_candidate to domains\n" unless Rails.env.test? - d = Domain.where('delete_at <= ?', Time.zone.now) - d.each do |domain| - next unless domain.delete_candidateable? - domain.statuses << DomainStatus::DELETE_CANDIDATE - STDOUT << "#{Time.zone.now.utc} Domain.start_delete_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? - domain.save + d = Domain.where('delete_at <= ?', Time.zone.now) + marked = 0 + real = 0 + d.each do |domain| + next unless domain.delete_candidateable? + real += 1 + domain.statuses << DomainStatus::DELETE_CANDIDATE + STDOUT << "#{Time.zone.now.utc} Domain.start_delete_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? + domain.save and marked += 1 + end + ensure # the operator should see what was accomplished + STDOUT << "#{Time.zone.now.utc} - Finished setting delete_candidate - #{marked} out of #{real} successfully set\n" unless Rails.env.test? end - - return if Rails.env.test? - STDOUT << "#{Time.zone.now.utc} - Successfully set delete_candidate to #{d.count} domains\n" + marked end def self.destroy_delete_candidates From d70c4b5d12a6d6d9ea1a55ef95f4e236be881d01 Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Mon, 1 Feb 2016 12:03:47 +0200 Subject: [PATCH 3/6] Story#110395650 - destroy_with_message is also extracted to class as it's used only for cron job --- app/models/domain.rb | 13 ------------- app/models/domain_cron.rb | 21 +++++++++++++++++---- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index da56741ae..513a40718 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -245,19 +245,6 @@ class Domain < ActiveRecord::Base { admin_contacts: :registrar } ) end - - # rubocop: enable Metrics/AbcSize - # rubocop:enable Rails/FindEach - # rubocop: enable Metrics/LineLength - def destroy_with_message(domain) - domain.destroy - bye_bye = domain.versions.last - domain.registrar.messages.create!( - body: "#{I18n.t(:domain_deleted)}: #{domain.name}", - attached_obj_id: bye_bye.id, - attached_obj_type: bye_bye.class.to_s # DomainVersion - ) - end end def name=(value) diff --git a/app/models/domain_cron.rb b/app/models/domain_cron.rb index 9e2540c9c..65e50a59c 100644 --- a/app/models/domain_cron.rb +++ b/app/models/domain_cron.rb @@ -20,7 +20,7 @@ class DomainCron if domain.pending_delete? || domain.pending_delete_confirmation? DomainMailer.pending_delete_expired_notification(domain.id, deliver_emails).deliver end - domain.clean_pendings! + domain.clean_pendings_lowlevel unless Rails.env.test? STDOUT << "#{Time.zone.now.utc} Domain.clean_expired_pendings: ##{domain.id} (#{domain.name})\n" end @@ -40,7 +40,7 @@ class DomainCron real += 1 domain.set_graceful_expired STDOUT << "#{Time.zone.now.utc} Domain.start_expire_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? - domain.save and marked += 1 + domain.save(validate: false) and marked += 1 end STDOUT << "#{Time.zone.now.utc} - Successfully expired #{marked} of #{real} domains\n" unless Rails.env.test? @@ -57,7 +57,7 @@ class DomainCron real += 1 domain.statuses << DomainStatus::SERVER_HOLD STDOUT << "#{Time.zone.now.utc} Domain.start_redemption_grace_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? - domain.save and marked += 1 + domain.save(validate: false) and marked += 1 end STDOUT << "#{Time.zone.now.utc} - Successfully set server_hold to #{marked} of #{real} domains\n" unless Rails.env.test? @@ -76,7 +76,7 @@ class DomainCron real += 1 domain.statuses << DomainStatus::DELETE_CANDIDATE STDOUT << "#{Time.zone.now.utc} Domain.start_delete_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? - domain.save and marked += 1 + domain.save(validate: false) and marked += 1 end ensure # the operator should see what was accomplished STDOUT << "#{Time.zone.now.utc} - Finished setting delete_candidate - #{marked} out of #{real} successfully set\n" unless Rails.env.test? @@ -106,4 +106,17 @@ class DomainCron STDOUT << "#{Time.zone.now.utc} - Successfully destroyed #{c} domains\n" unless Rails.env.test? end + # rubocop: enable Metrics/AbcSize + # rubocop:enable Rails/FindEach + # rubocop: enable Metrics/LineLength + def self.destroy_with_message(domain) + domain.destroy + bye_bye = domain.versions.last + domain.registrar.messages.create!( + body: "#{I18n.t(:domain_deleted)}: #{domain.name}", + attached_obj_id: bye_bye.id, + attached_obj_type: bye_bye.class.to_s # DomainVersion + ) + end + end From c38986adc3ab5d8e55b951f3ba78d3ece8c178ba Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Tue, 2 Feb 2016 12:00:14 +0200 Subject: [PATCH 4/6] Story#110395650 - messages are updated --- app/models/domain_cron.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/domain_cron.rb b/app/models/domain_cron.rb index 65e50a59c..74c09740e 100644 --- a/app/models/domain_cron.rb +++ b/app/models/domain_cron.rb @@ -22,7 +22,7 @@ class DomainCron end domain.clean_pendings_lowlevel unless Rails.env.test? - STDOUT << "#{Time.zone.now.utc} Domain.clean_expired_pendings: ##{domain.id} (#{domain.name})\n" + STDOUT << "#{Time.zone.now.utc} DomainCron.clean_expired_pendings: ##{domain.id} (#{domain.name})\n" end end STDOUT << "#{Time.zone.now.utc} - Successfully cancelled #{count} domain pendings\n" unless Rails.env.test? @@ -39,7 +39,7 @@ class DomainCron next unless domain.expirable? real += 1 domain.set_graceful_expired - STDOUT << "#{Time.zone.now.utc} Domain.start_expire_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? + STDOUT << "#{Time.zone.now.utc} DomainCron.start_expire_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? domain.save(validate: false) and marked += 1 end @@ -56,7 +56,7 @@ class DomainCron next unless domain.server_holdable? real += 1 domain.statuses << DomainStatus::SERVER_HOLD - STDOUT << "#{Time.zone.now.utc} Domain.start_redemption_grace_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? + STDOUT << "#{Time.zone.now.utc} DomainCron.start_redemption_grace_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? domain.save(validate: false) and marked += 1 end @@ -75,7 +75,7 @@ class DomainCron next unless domain.delete_candidateable? real += 1 domain.statuses << DomainStatus::DELETE_CANDIDATE - STDOUT << "#{Time.zone.now.utc} Domain.start_delete_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? + STDOUT << "#{Time.zone.now.utc} DomainCron.start_delete_period: ##{domain.id} (#{domain.name}) #{domain.changes}\n" unless Rails.env.test? domain.save(validate: false) and marked += 1 end ensure # the operator should see what was accomplished @@ -99,7 +99,7 @@ class DomainCron Domain.where('force_delete_at <= ?', Time.zone.now).each do |x| WhoisRecord.where(domain_id: x.id).destroy_all destroy_with_message x - STDOUT << "#{Time.zone.now.utc} Domain.destroy_delete_candidates: by force delete time ##{x.id} (#{x.name})\n" unless Rails.env.test? + STDOUT << "#{Time.zone.now.utc} DomainCron.destroy_delete_candidates: by force delete time ##{x.id} (#{x.name})\n" unless Rails.env.test? c += 1 end From 996e56c5cdf8ce7d64dd02c3e9cec641eb52cfc7 Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Tue, 2 Feb 2016 12:41:34 +0200 Subject: [PATCH 5/6] Story#110395650 - calling instance, not class methods --- app/models/domain.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index 513a40718..87f10bea5 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -204,28 +204,28 @@ class Domain < ActiveRecord::Base end def self.clean_expired_pendings + ActiveSupport::Deprecation.instance.deprecation_warning(DomainCron, __method__) DomainCron.send(__method__) - ActiveSupport::Deprecation.deprecate_methods(DomainCron, __method__) end def self.start_expire_period + ActiveSupport::Deprecation.instance.deprecation_warning(DomainCron, __method__) DomainCron.send(__method__) - ActiveSupport::Deprecation.deprecate_methods(DomainCron, __method__) end def self.start_redemption_grace_period + ActiveSupport::Deprecation.instance.deprecation_warning(DomainCron, __method__) DomainCron.send(__method__) - ActiveSupport::Deprecation.deprecate_methods(DomainCron, __method__) end def self.start_delete_period + ActiveSupport::Deprecation.instance.deprecation_warning(DomainCron, __method__) DomainCron.send(__method__) - ActiveSupport::Deprecation.deprecate_methods(DomainCron, __method__) end def self.destroy_delete_candidates + ActiveSupport::Deprecation.instance.deprecation_warning(DomainCron, __method__) DomainCron.send(__method__) - ActiveSupport::Deprecation.deprecate_methods(DomainCron, __method__) end class << self From c24e27710346bf5fda66ebd6053334926c4537e4 Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Tue, 2 Feb 2016 13:43:05 +0200 Subject: [PATCH 6/6] Story#110395650 - deprecation logs are shown in staging and production now as well --- config/environments/production.rb | 2 +- config/environments/staging.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index 58258e710..e47420a27 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -70,7 +70,7 @@ Rails.application.configure do config.i18n.fallbacks = true # Send deprecation notices to registered listeners. - config.active_support.deprecation = :notify + config.active_support.deprecation = :log # Disable automatic flushing of the log to improve performance. # config.autoflush_log = false diff --git a/config/environments/staging.rb b/config/environments/staging.rb index 0a5e3ecae..7ffc82641 100644 --- a/config/environments/staging.rb +++ b/config/environments/staging.rb @@ -70,7 +70,7 @@ Rails.application.configure do config.i18n.fallbacks = true # Send deprecation notices to registered listeners. - config.active_support.deprecation = :notify + config.active_support.deprecation = :log # Disable automatic flushing of the log to improve performance. # config.autoflush_log = false