Get the domain/account descriptions before deleting them.

[mailshears.git] / bin / mailshears

diff --git a/bin/mailshears b/bin/mailshears
index abf46cc9c188da4be8f0326345588d2fddb186da..9d870d04e245c4a6fef34c07b85ff9453694cd94 100755 (executable)
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -97,7 +97,7 @@ Plugin.includers.each do |plugin_class|
       header += current_time.to_s + "\n"
     end
 
-    header += 'Plugin: ' + plugin_name + "\n"
+    header += 'Plugin: ' + plugin_class.to_s + "\n"
     puts header
     puts '-' * header.size # Underline the header.
 
@@ -111,13 +111,18 @@ Plugin.includers.each do |plugin_class|
 
     if Configuration::I_MEAN_BUSINESS
       leftover_domains.each do |domain|
+        # Get the description before we delete the domain.
+        domain_description = plugin.describe_domain(domain)
         plugin.delete_domain(domain)
-        puts "Removed: #{domain} (#{plugin.describe_domain(domain)})"
+        puts "Removed: #{domain} (#{domain_description})"
       end
 
       leftover_accounts.each do |account|
+        # Get the description before we delete the domain.
+        # This can still fail if the account's domain is gone.
+        account_description = plugin.describe_account(account)
         plugin.delete_account(account)
-        puts "Removed: #{account} (#{plugin.describe_account(account)})"
+        puts "Removed: #{account} (#{account_description})"
       end
     end