avoid deadlocks, RT#10574

[freeside.git] / FS / bin / freeside-torrus-srvderive

diff --git a/FS/bin/freeside-torrus-srvderive b/FS/bin/freeside-torrus-srvderive
index 3985601..a02d23e 100644 (file)
--- a/FS/bin/freeside-torrus-srvderive
+++ b/FS/bin/freeside-torrus-srvderive
@@ -11,7 +11,8 @@ use FS::Record qw( qsearch str2time_sql str2time_sql_closing concat_sql );
 use FS::torrus_srvderive;
 
 our $DEBUG = 2;
-our $max_kids = 3;
+our $max_kids = 6;
+our $search_timeout = 30*60; # 15*60 5*60; #$torrus_srvderive->last_srv_date ? 5*60 : 15*60);
 our %kids;
 
 my $user = shift or die &usage;
@@ -101,8 +102,10 @@ while (1) {
       exit unless @serviceids; #don't try to search for empty virtual ports
 
       #nonlocking select statements; rows in this table never change
-      dbh->do('SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED')
-        if driver_name eq 'mysql';
+      if ( driver_name eq 'mysql' ) {
+        dbh->do('SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED');
+        dbh->commit or die dbh->errstr;
+      }
 
       my @in = ();
       for my $dir ('_IN', '_OUT') {
@@ -149,7 +152,7 @@ while (1) {
 
       eval {
         my $h = set_sig_handler( 'ALRM', sub { die "_timeout\n"; } );
-        alarm(15*60); #5*60); #$torrus_srvderive->last_srv_date ? 5*60 : 15*60);
+        alarm($search_timeout);
         $sth->execute($serviceid, $serviceid) or die $sth->errstr;
         alarm(0);
       };