From: ivan <ivan>
Date: Mon, 2 Jun 2008 02:45:54 +0000 (+0000)
Subject: yow, don't want everything to waitt until the timeout
X-Git-Tag: root_of_webpay_support~612
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=9aefe106db1f06d4e1047deaaf4aa7bdbdeb8fd2;hp=f163fa1c9f616fbbb5413e6fad09bd08957b0c3a;p=freeside.git

yow, don't want everything to waitt until the timeout
---

diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm
index 7a6a3b5b1..c3e2d0c90 100644
--- a/FS/FS/Misc.pm
+++ b/FS/FS/Misc.pm
@@ -18,7 +18,7 @@ use IPC::Run3; # for do_print... should just use IPC::Run i guess
                  generate_ps generate_pdf do_print
                );
 
-$DEBUG = 0;
+$DEBUG = 1;
 
 =head1 NAME
 
@@ -587,7 +587,8 @@ sub _pslatex {
   #my $sfile = shell_quote $file;
 
   my @cmd = (
-    'latex', '-interaction=batchmode',
+    'latex',
+    #'-interaction=errorstopmode',
     '\AtBeginDocument{\RequirePackage{pslatex}}',
     '\def\PSLATEXTMP{\futurelet\PSLATEXTMP\PSLATEXTMPB}',
     '\def\PSLATEXTMPB{\ifx\PSLATEXTMP\nonstopmode\else\input\fi}',
@@ -595,11 +596,15 @@ sub _pslatex {
     "$file.tex"
   );
 
-  my $timeout = 60; #?
+  my $timeout = 30; #? should be more than enough
 
   for ( 1, 2 ) {
-    run( \@cmd, '>'=>'/dev/null', '2>'=>'/dev/null', timeout($timeout) )
+
+    local($SIG{CHLD}) = sub {};
+    #run( \@cmd, '>'=>'/dev/null', '2>'=>'/dev/null', timeout($timeout) )
+    run( \@cmd, timeout($timeout) )
       or die "pslatex $file.tex failed; see $file.log for details?\n";
+
   }
 
 }