X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-torrus-srvderive;h=c2ee0329d4ca8a478a1550c46a36561d209eb719;hb=51a651e4f6c97dc18132f937c8e4c3b61a94bfcd;hp=b6450164f8d8aed6088dd8fd6254c73e5f0c2134;hpb=c1c95913cd4d5970e31649d5086548e7a71489d1;p=freeside.git

diff --git a/FS/bin/freeside-torrus-srvderive b/FS/bin/freeside-torrus-srvderive
index b6450164f..c2ee0329d 100644
--- a/FS/bin/freeside-torrus-srvderive
+++ b/FS/bin/freeside-torrus-srvderive
@@ -8,11 +8,11 @@ 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 = 2;
+our $DEBUG = 1;
 
 my $user = shift or die &usage;
 $FS::Daemon::PID_NEWSTYLE = 1;
-daemonize1('freeside-torrus-srvderive');
+daemonize1('torrus-srvderive');
 
 drop_root();
 
@@ -48,12 +48,17 @@ my $sql = "
     WHERE NOT EXISTS (
                        SELECT 1 FROM srvexport AS other
                          WHERE other.serviceid IN ( $in, $out )
+                           AND srvexport.srv_date = other.srv_date
                            AND ABS( $_date - $other_date ) <= 60
                      )
+";
+
+my $orderlimit = "
     ORDER BY srv_date, srv_time
     LIMIT 100
 ";
 
+
 while (1) {
 
   my $found = 0;
@@ -62,27 +67,50 @@ while (1) {
 
     my $serviceid = $torrus_srvderive->serviceid;
 
-    warn $sql if $DEBUG > 2;
-    my $sth = dbh->prepare($sql) or die $DBI::errstr; #better recovery?
+    my @serviceids = $torrus_srvderive->component_serviceids;
+
+    my @in = ();
+    for my $dir ('_IN', '_OUT') {
+      push @in, map dbh->quote("$_$dir"), @serviceids;
+    }
+    my $in = join(',', @in);
+
+    my $ssql = "
+      $sql AND EXISTS (
+                       SELECT 1 FROM srvexport AS other
+                         WHERE other.serviceid IN ($in)
+                           AND srvexport.srv_date = other.srv_date
+                           AND ABS( $_date - $other_date ) <= 60
+                     )
+    ";
+
+    $ssql .= " AND srv_date >= '". $torrus_srvderive->last_srv_date. "' "
+      if $torrus_srvderive->last_srv_date;
+
+    $ssql .= $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;
     my $prev = 0;
     while ( my $row = $sth->fetchrow_arrayref ) {
-      $found++;
+      last if sigterm() || sigint();
+
       my( $srv_date, $srv_time ) = @$row;
       my $cur = str2time( "$srv_date $srv_time" );
       next if $cur-$prev <= 60;
-      
+      last if time - $cur <= 300;
+
       warn "no $serviceid for $srv_date $srv_time; adding\n"
         if $DEBUG;
-
-      my @serviceids = $torrus_srvderive->component_serviceids;
+      $found++;
 
       for my $dir ('_IN', '_OUT') {
 
         my $sin = join(',', map dbh->quote("$_$dir"), @serviceids);
 
         my $sum = "
-          SELECT SUM(value) FROM srvexport AS other
+          SELECT COALESCE(SUM(value),0) FROM srvexport AS other
             WHERE other.serviceid IN ($sin)
               AND ABS( $cur - $other_date ) <= 60
         ";
@@ -93,17 +121,25 @@ while (1) {
         ";
         my @param = ( time2str('%Y-%m-%d', $cur), #srv_date
                       time2str('%X', $cur),       #srv_time
-                      $serviceid,
+                      "$serviceid$dir",
                       300, #intvl ... 
                     );
-        warn $isql. ' with param '. @param. "\n"
-          if $DEBUG > 1;
+        warn $isql. ' with param '. join(',',@param). "\n"
+          if $DEBUG > 2;
 
         my $isth = dbh->prepare($isql) or die $DBI::errstr; #better recovery?
         $isth->execute( @param )       or die $isth->errstr;
                         
       }
 
+      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;
     }
 
@@ -111,7 +147,7 @@ while (1) {
 
 
   myexit() if sigterm() || sigint();
-  sleep 60; # unless $found;
+  sleep 60 unless $found;
 }
 
 sub _shouldrun {