alternate (hopefully more efficient) path: if we're more than a day behind, call...

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

diff --git a/FS/bin/freeside-torrus-srvderive b/FS/bin/freeside-torrus-srvderive
index a89cf39..6a9c3a2 100644 (file)
--- a/FS/bin/freeside-torrus-srvderive
+++ b/FS/bin/freeside-torrus-srvderive
@@ -5,14 +5,15 @@ use POSIX qw( :sys_wait_h );
 use Sys::SigAction qw( set_sig_handler );
 use Date::Parse;
 use Date::Format;
+use IPC::Run;
 use FS::Daemon ':all'; #daemonize1 drop_root daemonize2 myexit logfile sig*
 use FS::UID qw( adminsuidsetup forksuidsetup dbh driver_name );
 use FS::Record qw( qsearch str2time_sql str2time_sql_closing concat_sql );
 use FS::torrus_srvderive;
 
 our $DEBUG = 2;
-our $max_kids = 6;
-our $search_timeout = 60*60; #30*60; # 15*60 5*60; #$torrus_srvderive->last_srv_date ? 5*60 : 15*60);
+our $max_kids = 16;
+our $search_timeout = 2*60*60; #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;
@@ -60,7 +61,7 @@ my $sql = "
 
 my $orderlimit = "
     ORDER BY srv_date, srv_time
-    LIMIT 50
+    LIMIT 200
 ";
 
 if ( driver_name =~ /mysql/i ) {
@@ -137,6 +138,46 @@ while (1) {
         }
       }
 
+      #alternate (hopefully more efficient) path: if we're more than a day
+      #behind, call native torrus srvderive
+      my $last_srv_date = $torrus_srvderive->last_srv_date;
+      my $currdate = time2str('%Y-%m-%d', time);
+      if ( $last_srv_date ne $currdate ) {
+        warn "serviceid $serviceid last_srv_date != $currdate\n" if $DEBUG;
+
+        #delete records from last_srv_date
+        my $dsql =
+          'DELETE FROM srvexport WHERE srv_date = ? AND serviceid IN(?,?)';
+         my $dsth = dbh->prepare($dsql) or die $DBI::errstr;
+         $dsth->execute($last_srv_date, $serviceid.'_IN', $serviceid.'_OUT')
+           or die $dsth->errstr;
+        dbh->commit or die dbh->errstr;
+
+        foreach my $dir ('_IN','_OUT') {
+
+          #XX TORRUS_PATH
+          my @cmd = ( '/usr/local/bin/torrus', 'srvderive',
+                        "--start=$last_srv_date", "--end=$currdate",
+                        "--out=$serviceid$dir", "--func=SUM",
+                        map "$_$dir", @serviceids
+                    );
+
+          warn "calling native srvderive: ". join(' ', @cmd). "\n" if $DEBUG;
+          run( \@cmd ); #verbose?  timeout?
+
+        }
+        warn "native srvderive done" if $DEBUG;
+
+        $torrus_srvderive->last_srv_date($currdate);
+        my $error = $torrus_srvderive->replace;
+        die $error if $error;
+
+        #don't bother trying today's immediately
+        warn "done with $serviceid for now\n" if $DEBUG;
+        exit; #end-of-kid
+
+      }
+
       my $ssql = "
         $sql AND EXISTS (
                          SELECT 1 FROM srvexport AS other
@@ -203,14 +244,18 @@ while (1) {
                 AND other.srv_date = '$srv_date'
                 AND ABS( $cur - $other_date ) <= 60
           ";
+          my $ssth = dbh->prepare($sum) or die $DBI::errstr;
+          $ssth->execute or die $ssth->errstr; #better recovery?
+          my $value = $ssth->fetchrow_arrayref->[0];
 
           my $isql = "
-            INSERT INTO srvexport ( srv_date, srv_time, serviceid, value, intvl )
-              VALUES ( ?, ?, ?, ($sum), ? )
+            INSERT INTO srvexport (srv_date, srv_time, serviceid, value, intvl)
+              VALUES ( ?, ?, ?, ?, ? )
           ";
           my @param = ( $srv_date,
                         time2str('%X', $cur), #srv_time
                         "$serviceid$dir",     #serviceid
+                        $value,
                         300,                  #intvl ... 
                       );
           warn $isql. ' with param '. join(',',@param). "\n"