From: ivan <ivan>
Date: Wed, 21 Apr 2004 20:52:40 +0000 (+0000)
Subject: as an invoice event, emailing/printing problems should be fatal and trigger retry
X-Git-Tag: freeside_1_4_2beta1~131
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=491abb349fbf66731fbc2fd0ff46868c5240e7a8;p=freeside.git

as an invoice event, emailing/printing problems should be fatal and trigger retry
---

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 591ae0c9c..2639abfae 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -417,9 +417,9 @@ sub send {
     $!=0;
     $message->smtpsend( Host => $smtpmachine )
       or $message->smtpsend( Host => $smtpmachine, Debug => 1 )
-        or return "(customer # ". $self->custnum. ") can't send invoice email".
-                  " to ". join(', ', grep { $_ ne 'POST' } @invoicing_list ).
-                  " via server $smtpmachine with SMTP: $!";
+        or die "(customer # ". $self->custnum. ") can't send invoice email".
+               " to ". join(', ', grep { $_ ne 'POST' } @invoicing_list ).
+               " via server $smtpmachine with SMTP: $!\n";
 
   }
 
@@ -429,11 +429,11 @@ sub send {
 
   if ( grep { $_ eq 'POST' } @invoicing_list ) { #postal
     open(LPR, "|$lpr")
-      or return "Can't open pipe to $lpr: $!";
+      or die "Can't open pipe to $lpr: $!\n";
     print LPR @print_text;
     close LPR
-      or return $! ? "Error closing $lpr: $!"
-                   : "Exit status $? from $lpr";
+      or die $! ? "Error closing $lpr: $!\n"
+                : "Exit status $? from $lpr\n";
   }
 
   '';