From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 30 Oct 2015 01:20:46 +0000 (-0400)
Subject: Dump our output buffer if a plugin crashes.
X-Git-Tag: 0.0.1~50
X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=95436a8be4f7d084e0a300fd5233975d5eba3926;p=mailshears.git

Dump our output buffer if a plugin crashes.
---

diff --git a/bin/mailshears b/bin/mailshears
index a218b2b..4d69f8f 100755
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -91,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