From d8e43e0b64268247d9dd9cc1a8bdf132ef615e70 Mon Sep 17 00:00:00 2001
From: Stas <stanislav@perfectline.co>
Date: Fri, 20 May 2016 17:08:15 +0300
Subject: [PATCH 1/2] 115693873-whodunnit-upd

---
 app/jobs/update_whois_record_job.rb | 2 +-
 app/models/domain_cron.rb           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/jobs/update_whois_record_job.rb b/app/jobs/update_whois_record_job.rb
index c397dfdc9..6851f6121 100644
--- a/app/jobs/update_whois_record_job.rb
+++ b/app/jobs/update_whois_record_job.rb
@@ -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
 
diff --git a/app/models/domain_cron.rb b/app/models/domain_cron.rb
index 25586fabb..300dec9e2 100644
--- a/app/models/domain_cron.rb
+++ b/app/models/domain_cron.rb
@@ -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

From 248a04f63af62c6ddafdedcdda90932491025f03 Mon Sep 17 00:00:00 2001
From: Stas <stanislav@perfectline.co>
Date: Fri, 20 May 2016 17:08:55 +0300
Subject: [PATCH 2/2] 115693873-class_name_msg

---
 app/models/domain.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/domain.rb b/app/models/domain.rb
index b277ed9c9..978839832 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -353,7 +353,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__}"
 
     update_columns(
         registrant_verification_token:    nil,