RT#7869: fix error messages when send_email fails in the job queue

[freeside.git] / FS / FS / Daemon.pm

diff --git a/FS/FS/Daemon.pm b/FS/FS/Daemon.pm
index ca18134..f92a2ee 100644 (file)
--- a/FS/FS/Daemon.pm
+++ b/FS/FS/Daemon.pm
@@ -83,6 +83,7 @@ sub myexit {
 }
 
 sub _die {
+  die @_ if $^S; # $^S = 1 during an eval(), don't break exception handling
   my $msg = shift;
   unlink $pid_file if -e $pid_file;
   _logmsg($msg);