Merge branch '115693873-whodunnit_empty' into staging

This commit is contained in:
Stas 2016-05-24 13:59:19 +03:00
commit 31e0f44856
3 changed files with 3 additions and 3 deletions

View file

@ -8,13 +8,13 @@ class UpdateWhoisRecordJob < Que::Job
end
Array(names).each do |name|
::PaperTrail.whodunnit = "job - #{self.class.name} - #{type}"
record = klass.find_by(name: name)
if record
send "update_#{type}", record
else
send "delete_#{type}", name
end
::PaperTrail.whodunnit = "job - #{self.class.name} - #{type}"
end
end

View file

@ -361,7 +361,7 @@ class Domain < ActiveRecord::Base
status_notes[DomainStatus::PENDING_UPDATE] = ''
status_notes[DomainStatus::PENDING_DELETE] = ''
::PaperTrail.whodunnit = "#{self.class.name} - #{__method__}"
::PaperTrail.whodunnit = "Domain - #{__method__}"
hash = {
registrant_verification_token: nil,

View file

@ -13,6 +13,7 @@ class DomainCron
STDOUT << msg unless Rails.env.test?
next
end
::PaperTrail.whodunnit = "cron - #{__method__}"
count += 1
if domain.pending_update?
DomainMailer.pending_update_expired_notification_for_new_registrant(domain.id).deliver
@ -25,7 +26,6 @@ class DomainCron
STDOUT << "#{Time.zone.now.utc} DomainCron.clean_expired_pendings: ##{domain.id} (#{domain.name})\n"
end
UpdateWhoisRecordJob.enqueue domain.name, 'domain'
::PaperTrail.whodunnit = "cron - #{__method__}"
end
STDOUT << "#{Time.zone.now.utc} - Successfully cancelled #{count} domain pendings\n" unless Rails.env.test?
count