X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-torrus-srvderive;h=95cc76daa1a19845bbeb967519fcf87d5a8b987e;hb=40b7a4573412f467853f9681b71014fd78c2b4c6;hp=3a23f7cf9ed152b43ca365427ad8889db7315984;hpb=0dfaa4edbfa786b0cd7c444312fd68ff238717d5;p=freeside.git

diff --git a/FS/bin/freeside-torrus-srvderive b/FS/bin/freeside-torrus-srvderive
index 3a23f7cf9..95cc76daa 100644
--- a/FS/bin/freeside-torrus-srvderive
+++ b/FS/bin/freeside-torrus-srvderive
@@ -1,6 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
+use Sys::SigAction qw( set_sig_handler );
 use Date::Parse;
 use Date::Format;
 use FS::Daemon ':all'; #daemonize1 drop_root daemonize2 myexit logfile sig*
@@ -8,7 +9,7 @@ use FS::UID qw( adminsuidsetup dbh driver_name );
 use FS::Record qw( qsearch str2time_sql str2time_sql_closing concat_sql );
 use FS::torrus_srvderive;
 
-our $DEBUG = 3;
+our $DEBUG = 2;
 
 my $user = shift or die &usage;
 $FS::Daemon::PID_NEWSTYLE = 1;
@@ -55,11 +56,11 @@ my $sql = "
 
 my $orderlimit = "
     ORDER BY srv_date, srv_time
-    LIMIT 100
+    LIMIT 50
 ";
 
 
-while (1) {
+MAIN: while (1) {
 
   my $found = 0;
 
@@ -82,12 +83,43 @@ while (1) {
                            AND srvexport.srv_date = other.srv_date
                            AND ABS( $_date - $other_date ) <= 60
                      )
-      $orderlimit
     ";
 
-    warn $ssql if $DEBUG > 1;
-    my $sth = dbh->prepare($ssql) or die $DBI::errstr; #better recovery?
-    $sth->execute($serviceid, $serviceid) or die $sth->errstr;
+    $ssql .= " AND srv_date >= '". $torrus_srvderive->last_srv_date. "' "
+      if $torrus_srvderive->last_srv_date;
+
+    $ssql .= $orderlimit;
+
+    warn "searching for times to add $serviceid\n" if $DEBUG;
+    warn $ssql if $DEBUG > 2;
+    my $sth = dbh->prepare($ssql) or die $DBI::errstr; #better recovery here?
+
+    warn "executing search" if $DEBUG;
+
+    eval {
+      my $timeout = set_sig_handler(
+        'ALRM', sub {
+          dbh->clone()->do("KILL QUERY ". dbh->{"mysql_thread_id"})
+            if driver_name eq 'mysql';
+          die '_timeout';
+        },
+        { mask=>['ALRM'] , safe=>1 }
+      );
+      alarm(5*60); # 15*60);
+      $sth->execute($serviceid, $serviceid) or die $sth->errstr;
+      alarm(0);
+    };
+    alarm(0);
+    if ( $@ =~ /^_timeout/ ) {
+      warn "search timed out; reconnecting and restarting\n";
+      adminsuidsetup($user);
+      next MAIN;
+    } elsif ( $@ ) {
+      die $@;
+    }
+
+    warn "search executed; checking results" if $DEBUG;
+
     my $prev = 0;
     while ( my $row = $sth->fetchrow_arrayref ) {
       last if sigterm() || sigint();
@@ -124,18 +156,35 @@ while (1) {
           if $DEBUG > 2;
 
         my $isth = dbh->prepare($isql) or die $DBI::errstr; #better recovery?
-        $isth->execute( @param )       or die $isth->errstr;
-        dbh->commit                    or die dbh->errstr;
+
+        #stupid mysql deadlocks all the time on insert, so we need to recover
+        unless ( $isth->execute(@param) ) {
+          warn "Error inserting data for $serviceid$dir (restarting): ".
+               $isth->errstr;
+          dbh->rollback; #or die dbh->errstr;
+          sleep 5;
+          next MAIN;
+        }
                         
       }
 
+      if ( $srv_date ne $torrus_srvderive->last_srv_date ) {
+        warn "updating last_srv_date of $serviceid to $srv_date\n" if $DEBUG;
+        $torrus_srvderive->last_srv_date($srv_date);
+        my $error = $torrus_srvderive->replace;
+        die $error if $error;
+      }
+      dbh->commit or die dbh->errstr;
+
       $prev = $cur;
     }
+    warn "done with $serviceid\n" if $DEBUG;
 
-  }
-
+  } #foreach my $torrus_srvderive
+  dbh->commit or die dbh->errstr;
 
   myexit() if sigterm() || sigint();
+  warn "restarting main loop\n" if $DEBUG > 1;
   sleep 60 unless $found;
 }