X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=bin%2Fmailshears;h=c033f5e639491210b33cda1e69512179798c8f5c;hp=01dcb30f2a2fc2d73d22f36f2f4b43ed92800f42;hb=5090dd6667fa5acfe759a6cacf0c72d8cb0e2986;hpb=87c9c583caca33112f88622eed8849e98bdf3a26

diff --git a/bin/mailshears b/bin/mailshears
index 01dcb30..c033f5e 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)