X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-torrus-srvderive;h=9d9fcb6eb04fc762912fa666d8e3fb1027c4f634;hb=b6b2c8881a7156df8f185147082219b6b96a530c;hp=c9ce1e74554603995a531f6f672aba05e335b22d;hpb=4daea0bbe177744036c67dc4917fa13a32e33a97;p=freeside.git

diff --git a/FS/bin/freeside-torrus-srvderive b/FS/bin/freeside-torrus-srvderive
index c9ce1e745..9d9fcb6eb 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();
 
@@ -40,8 +40,6 @@ my $other_date = concat_sql([ 'other.srv_date', "' '", 'other.srv_time' ]);
 $other_date = "CAST( $other_date AS TIMESTAMP )" if driver_name =~ /^Pg/i;
 $other_date = str2time_sql. $other_date.  str2time_sql_closing;
 
-my $within = ABS( $_date - $other_date ) <= 60;
-
 my $in  = concat_sql([ '?', "'_IN'" ]);
 my $out = concat_sql([ '?', "'_OUT'" ]);
 
@@ -50,7 +48,8 @@ my $sql = "
     WHERE NOT EXISTS (
                        SELECT 1 FROM srvexport AS other
                          WHERE other.serviceid IN ( $in, $out )
-                           AND $within
+                           AND srvexport.srv_date = other.srv_date
+                           AND ABS( $_date - $other_date ) <= 60
                      )
     ORDER BY srv_date, srv_time
     LIMIT 100
@@ -64,18 +63,21 @@ while (1) {
 
     my $serviceid = $torrus_srvderive->serviceid;
 
-    warn $sql if $DEBUG > 1;
+    warn $sql if $DEBUG > 2;
     my $sth = dbh->prepare($sql) 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;
+      $found++;
 
       my @serviceids = $torrus_srvderive->component_serviceids;
 
@@ -84,23 +86,26 @@ while (1) {
         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 $within
+              AND ABS( $cur - $other_date ) <= 60
         ";
 
         my $isql = "
           INSERT INTO srvexport ( srv_date, srv_time, serviceid, value, intvl )
             VALUES ( ?, ?, ?, ($sum), ? )
         ";
+        my @param = ( time2str('%Y-%m-%d', $cur), #srv_date
+                      time2str('%X', $cur),       #srv_time
+                      "$serviceid$dir",
+                      300, #intvl ... 
+                    );
+        warn $isql. ' with param '. join(',',@param). "\n"
+          if $DEBUG > 1;
 
         my $isth = dbh->prepare($isql) or die $DBI::errstr; #better recovery?
-        $isth->execute( time2str('%Y-%m-%d', $cur), #srv_date
-                        time2str('%X', $cur),       #srv_time
-                        $serviceid,
-                        300, #intvl ... 
-                      )
-          or die $isth->errstr;
+        $isth->execute( @param )       or die $isth->errstr;
+        dbh->commit                    or die dbh->errstr;
                         
       }
 
@@ -111,7 +116,7 @@ while (1) {
 
 
   myexit() if sigterm() || sigint();
-  sleep 60; # unless $found;
+  sleep 60 unless $found;
 }
 
 sub _shouldrun {