use FS::Record qw( qsearch str2time_sql str2time_sql_closing concat_sql );
use FS::torrus_srvderive;
-our $DEBUG = 2;
+our $DEBUG = 3;
my $user = shift or die &usage;
$FS::Daemon::PID_NEWSTYLE = 1;
-daemonize1('freeside-torrus-srvderive');
+daemonize1('torrus-srvderive');
drop_root();
$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'" ]);
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
)
+";
+
+my $orderlimit = "
ORDER BY srv_date, srv_time
LIMIT 100
";
+
while (1) {
my $found = 0;
my $serviceid = $torrus_srvderive->serviceid;
- warn $sql if $DEBUG > 1;
- 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
+ )
+ $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 $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 > 2;
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;
}
myexit() if sigterm() || sigint();
- sleep 60; # unless $found;
+ sleep 60 unless $found;
}
sub _shouldrun {