X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-torrus-srvderive;h=cd893b44e72d03bf10b5b1a4f36df16100968008;hb=c4b71bc4459cb7d403cbebede470aeb2c6292a6e;hp=6a9c3a2c384288fbad352778c11f059aa6a64f26;hpb=faae79a7b3f88dc0df82e456b2aca9ff977407d1;p=freeside.git

diff --git a/FS/bin/freeside-torrus-srvderive b/FS/bin/freeside-torrus-srvderive
index 6a9c3a2c3..cd893b44e 100644
--- a/FS/bin/freeside-torrus-srvderive
+++ b/FS/bin/freeside-torrus-srvderive
@@ -5,14 +5,14 @@ use POSIX qw( :sys_wait_h );
 use Sys::SigAction qw( set_sig_handler );
 use Date::Parse;
 use Date::Format;
-use IPC::Run;
+use IPC::Run qw( run ); #timeout );
 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 = 16;
+our $max_kids = 4;
 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;
 
@@ -142,15 +142,19 @@ while (1) {
       #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 ) {
+      if ( $last_srv_date ne $currdate
+           && time - str2time($last_srv_date) > (24+6)*60*60 #6 hour window for
+         ) {                                                 #yesterday
         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;
+        my $dsth = dbh->prepare($dsql) or die $DBI::errstr;
+        warn "$dsql $last_srv_date ${serviceid}_IN ${serviceid}_OUT\n"
+          if $DEBUG;
+        $dsth->execute($last_srv_date, $serviceid.'_IN', $serviceid.'_OUT')
+          or die $dsth->errstr;
         dbh->commit or die dbh->errstr;
 
         foreach my $dir ('_IN','_OUT') {
@@ -163,7 +167,9 @@ while (1) {
                     );
 
           warn "calling native srvderive: ". join(' ', @cmd). "\n" if $DEBUG;
-          run( \@cmd ); #verbose?  timeout?
+          my $out_and_err = '';
+          run( \@cmd, '>&', \$out_and_err ) #verbose?  timeout?
+            or die "error calling native srvder: $out_and_err\n";
 
         }
         warn "native srvderive done" if $DEBUG;