[freeside-commits] freeside/FS/bin freeside-torrus-srvderive, 1.33, 1.34

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/bin
In directory wavetail.420.am:/tmp/cvs-serv23419/FS/bin

Modified Files:
	freeside-torrus-srvderive 
Log Message:
continue attempting to handle mysql hanging on queries, RT#10574

Index: freeside-torrus-srvderive
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/bin/freeside-torrus-srvderive,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -w -d -r1.33 -r1.34
--- freeside-torrus-srvderive	8 Apr 2011 01:04:33 -0000	1.33
+++ freeside-torrus-srvderive	8 Apr 2011 01:27:56 -0000	1.34
@@ -94,11 +94,13 @@
     warn $ssql if $DEBUG > 2;
     my $sth = dbh->prepare($ssql) or die $DBI::errstr; #better recovery here?
 
-    warn "executing search" if $DEBUG;
+    warn "executing search\n" if $DEBUG;
 
     eval {
-      my $timeout = set_sig_handler(
+      my $h = set_sig_handler(
         'ALRM', sub {
+          local $SIG{__DIE__};
+          warn "search timed out\n";
           dbh->clone()->do("KILL QUERY ". dbh->{"mysql_thread_id"})
             if driver_name eq 'mysql';
           die '_timeout';
@@ -118,7 +120,7 @@
       die $@;
     }
 
-    warn "search executed; checking results" if $DEBUG;
+    warn "search executed; checking results\n" if $DEBUG;
 
     my $prev = 0;
     while ( my $row = $sth->fetchrow_arrayref ) {