X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=bin%2Fmailshears;h=5d1c7982dd6978939fce3edbeb9480d68c4e19f8;hp=b1a5e00e1d66885f7ceed478f6031912b540429f;hb=566f5fe84f82bb26e86b0902d65fc89693e9d813;hpb=451f1c3175c1a3c8670f51ebc907102d8c99820d

diff --git a/bin/mailshears b/bin/mailshears
index b1a5e00..5d1c798 100755
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -15,13 +15,14 @@
 
 require 'mailshears'
 
-pgadb = PostfixadminDb.new(Configuration::dbhost,
-                           Configuration::dbport,
-                           Configuration::dbopts,
-                           Configuration::dbtty,
-                           Configuration::dbname,
-                           Configuration::dbuser,
-                           Configuration::dbpass)
+cfg = Configuration.new()
+pgadb = PostfixadminDb.new(cfg.dbhost,
+                           cfg.dbport,
+                           cfg.dbopts,
+                           cfg.dbtty,
+                           cfg.dbname,
+                           cfg.dbuser,
+                           cfg.dbpass)
 
 
 begin
@@ -69,10 +70,10 @@ Plugin.includers.each do |plugin_class|
       header += current_time.iso8601.to_s
     else
       # Fall back to whatever this looks like.
-      header += current_time.to_s + "\n"
+      header += current_time.to_s
     end
 
-    header += 'Plugin: ' + plugin_class.to_s + "\n"
+    header += ' (Plugin: ' + plugin_class.to_s + ")\n"
     puts header
     puts '-' * header.size # Underline the header.
 
@@ -84,7 +85,7 @@ Plugin.includers.each do |plugin_class|
       puts "Found: #{account} (#{plugin.describe_account(account)})"
     end
 
-    if Configuration::i_mean_business
+    if cfg.i_mean_business
       # We have to delete the accounts before the domain,
       # otherwise they'd already be gone.
       leftover_accounts.each do |account|
@@ -94,7 +95,7 @@ Plugin.includers.each do |plugin_class|
         plugin.delete_account(account)
         puts "Removed: #{account} (#{account_description})"
       end
-      
+
       leftover_domains.each do |domain|
         # Get the description before we delete the domain.
         domain_description = plugin.describe_domain(domain)