[freeside-commits] freeside/FS/bin freeside-torrus-srvderive, 1.50, 1.51

[Ivan,,,]

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

Modified Files:
	freeside-torrus-srvderive 
Log Message:
1 hour timeout?  give it a shot

Index: freeside-torrus-srvderive
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/bin/freeside-torrus-srvderive,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -w -d -r1.50 -r1.51
--- freeside-torrus-srvderive	19 May 2011 15:51:50 -0000	1.50
+++ freeside-torrus-srvderive	19 May 2011 17:34:55 -0000	1.51
@@ -12,7 +12,7 @@
 
 our $DEBUG = 2;
 our $max_kids = 6;
-our $search_timeout = 30*60; # 15*60 5*60; #$torrus_srvderive->last_srv_date ? 5*60 : 15*60);
+our $search_timeout = 60*60; #30*60; # 15*60 5*60; #$torrus_srvderive->last_srv_date ? 5*60 : 15*60);
 our %kids;
 
 my $user = shift or die &usage;
@@ -63,7 +63,7 @@
     LIMIT 50
 ";
 
-if ( driver_name eq 'mysql' ) {
+if ( driver_name =~ /mysql/i ) {
   dbh->do('SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED');
   dbh->commit or die dbh->errstr;
 }
@@ -107,7 +107,7 @@
       exit unless @serviceids; #don't try to search for empty virtual ports
 
       #nonlocking select statements; rows in this table never change
-      if ( driver_name eq 'mysql' ) {
+      if ( driver_name =~ /mysql/i ) {
         dbh->do('SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED');
         dbh->commit or die dbh->errstr;
       }
@@ -167,7 +167,7 @@
         #warn "search timed out; reconnecting and restarting\n";
         warn "search timed out\n";
         dbh->clone()->do("KILL QUERY ". dbh->{"mysql_thread_id"})
-          if driver_name eq 'mysql';
+          if driver_name =~ /mysql/i;
         dbh->rollback; #or die dbh->errstr;
         #adminsuidsetup($user);
         #next SERVICEID; #MAIN;