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 );
#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;
+ sleep 20;
+
foreach my $dir ('_IN','_OUT') {
#XX TORRUS_PATH
);
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;