X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=bin%2Fmailshears;h=4d69f8fb67ab2df8a7615e4601b01e8228617a84;hp=f7d5afa5b10c75264e92f275f4bfeb24724bb74e;hb=95436a8be4f7d084e0a300fd5233975d5eba3926;hpb=c2737d4d972df30725e417bed0940fc8df8e88bd

diff --git a/bin/mailshears b/bin/mailshears
index f7d5afa..4d69f8f 100755
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -1,17 +1,7 @@
-#!/usr/bin/ruby -wKU
+#!/usr/bin/ruby -wU
 #
 # mailshears, to prune unused mail directories.
 #
-# Mail users for virtual hosts are stored in SQL, and managed by
-# Postfixadmin. However, the physical directories are handled by
-# Postfix/Dovecot and are left untouched by Postfixadmin. This is good
-# for security, but comes at a cost: Postfixadmin can't remove a
-# user's mail directory when his or her account is deleted.
-#
-# This program compares the list of filesystem users with the ones
-# in the database. It outputs any users that exist in the
-# filesystem, but not the database.
-#
 
 # Define a usage string using the program name.
 exe = File.basename($PROGRAM_NAME)
@@ -101,13 +91,19 @@ require 'stringio'
 output_buffer = StringIO.new()
 $stdout = output_buffer
 
-plugin_module.run(cfg, *ARGV)
-
-# Restore stdout, and print the header plus whatever the plugins
-# produced if they produced anything. If they didn't, we avoid
-# printing the header.
-$stdout = STDOUT
-if output_buffer.size > 0 then
-  puts make_header(plugin_module.to_s())
-  puts output_buffer.string()
+begin
+  plugin_module.run(cfg, *ARGV)
+ensure
+  # Now restore stdout, and print the header plus whatever the plugins
+  # produced if they produced anything. If they didn't produce any
+  # output, then we avoid printing the header.
+  #
+  # This gets wrapped in an "ensure" block because otherwise, if
+  # plugin_module.run() crashes, the traceback will get stored in
+  # output_buffer and never get printed.
+  $stdout = STDOUT
+  if output_buffer.size > 0 then
+    puts make_header(plugin_module.to_s())
+    puts output_buffer.string()
+  end
 end