From bd308615d789c624c787d8139655bcf5fd6358c7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 8 Apr 2011 01:31:48 +0000
Subject: [PATCH] continue attempting to handle mysql hanging on queries,
 RT#10574

---
 FS/bin/freeside-torrus-srvderive | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/FS/bin/freeside-torrus-srvderive b/FS/bin/freeside-torrus-srvderive
index 4ee367bd4..0bf2db82d 100644
--- a/FS/bin/freeside-torrus-srvderive
+++ b/FS/bin/freeside-torrus-srvderive
@@ -96,28 +96,22 @@ MAIN: while (1) {
 
     warn "executing search\n" if $DEBUG;
 
+    my $alarm = 0;
     eval {
-      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';
-        },
-        { mask=>['ALRM'] , safe=>1 }
-      );
+      my $h = set_sig_handler( 'ALRM', sub { $alarm = 1; } );
       alarm(5*60); # 15*60);
       $sth->execute($serviceid, $serviceid) or die $sth->errstr;
       alarm(0);
     };
     alarm(0);
-    if ( $@ =~ /^_timeout/ ) {
+    die $@ if $@;
+    
+    if ( $alarm ) {
       warn "search timed out; reconnecting and restarting\n";
+      dbh->clone()->do("KILL QUERY ". dbh->{"mysql_thread_id"})
+        if driver_name eq 'mysql';
       adminsuidsetup($user);
       next MAIN;
-    } elsif ( $@ ) {
-      die $@;
     }
 
     warn "search executed; checking results\n" if $DEBUG;
-- 
2.11.0