From 54a810524f3a20819ee4c5a46cd8762171736d77 Mon Sep 17 00:00:00 2001 From: Matt Farnsworth Date: Tue, 8 Dec 2015 15:47:46 +0200 Subject: [PATCH 1/5] Story #109699502 - count and report items marked pendinDelete --- app/models/domain.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index ef714716b..d42b13b28 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -288,15 +288,17 @@ class Domain < ActiveRecord::Base STDOUT << "#{Time.zone.now.utc} - Setting delete_candidate to domains\n" unless Rails.env.test? d = Domain.where('delete_at <= ?', Time.zone.now) + marked = 0 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 + marked += 1 end return if Rails.env.test? - STDOUT << "#{Time.zone.now.utc} - Successfully set delete_candidate to #{d.count} domains\n" + STDOUT << "#{Time.zone.now.utc} - Finished setting delete_candidate - #{marked} out of #{d.count} successfully set\n" end # rubocop:disable Rails/FindEach From 1d8dcd923aba1cc32697c7e69d8730748e39a676 Mon Sep 17 00:00:00 2001 From: Matt Farnsworth Date: Tue, 8 Dec 2015 17:03:57 +0200 Subject: [PATCH 2/5] Story #109699502 - ensure log string reported if error occurs, wrap w/begin reformat white, move trailing condition --- app/models/domain.rb | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index d42b13b28..6cd0f7c4a 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -285,20 +285,21 @@ class Domain < ActiveRecord::Base end def 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) - marked = 0 - 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 - marked += 1 + d = Domain.where('delete_at <= ?', Time.zone.now) + marked = 0 + 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 + marked += 1 + end + ensure # the operator should see what was accomplished + STDOUT << "#{Time.zone.now.utc} - Finished setting delete_candidate - #{marked} out of #{d.count} successfully set\n" unless Rails.env.test? end - - return if Rails.env.test? - STDOUT << "#{Time.zone.now.utc} - Finished setting delete_candidate - #{marked} out of #{d.count} successfully set\n" end # rubocop:disable Rails/FindEach From 7d5212255457206a59b85172c61368ff4d2698b4 Mon Sep 17 00:00:00 2001 From: Matt Farnsworth Date: Tue, 8 Dec 2015 17:05:34 +0200 Subject: [PATCH 3/5] Story #109699502 - only count records when save succeeds --- app/models/domain.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index 6cd0f7c4a..9ed21658b 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -294,8 +294,7 @@ class Domain < ActiveRecord::Base 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 - marked += 1 + 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 #{d.count} successfully set\n" unless Rails.env.test? From d5b8761ddfb7de5cade25f14e1d7eb51f7ce20ee Mon Sep 17 00:00:00 2001 From: Matt Farnsworth Date: Tue, 8 Dec 2015 17:18:10 +0200 Subject: [PATCH 4/5] Story #109699502 - quitier return candidates countwq --- app/models/domain.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/domain.rb b/app/models/domain.rb index 9ed21658b..b74e8f299 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -299,6 +299,7 @@ class Domain < ActiveRecord::Base ensure # the operator should see what was accomplished STDOUT << "#{Time.zone.now.utc} - Finished setting delete_candidate - #{marked} out of #{d.count} successfully set\n" unless Rails.env.test? end + marked end # rubocop:disable Rails/FindEach From 159ea79f2f8409bfdf895a3040a3ec7581dc4115 Mon Sep 17 00:00:00 2001 From: Stas Date: Wed, 6 Jan 2016 16:41:43 +0200 Subject: [PATCH 5/5] 109699502-count_and_logic_change --- app/models/domain.rb | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index b74e8f299..edeb51337 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -260,28 +260,35 @@ class Domain < ActiveRecord::Base 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 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 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 start_delete_period @@ -290,14 +297,16 @@ class Domain < ActiveRecord::Base 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 #{d.count} successfully set\n" unless Rails.env.test? + STDOUT << "#{Time.zone.now.utc} - Finished setting delete_candidate - #{marked} out of #{real} successfully set\n" unless Rails.env.test? end marked end