use strict;
use Date::Parse;
+use Date::Format;
use FS::Daemon ':all'; #daemonize1 drop_root daemonize2 myexit logfile sig*
use FS::UID qw( adminsuidsetup dbh driver_name );
use FS::Record qw( qsearch str2time_sql str2time_sql_closing concat_sql );
$other_date = "CAST( $other_date AS TIMESTAMP )" if driver_name =~ /^Pg/i;
$other_date = str2time_sql. $other_date. str2time_sql_closing;
+my $in = concat_sql([ '?', "'_IN'" ]);
+my $out = concat_sql([ '?', "'_OUT'" ]);
+
my $sql = "
SELECT DISTINCT srv_date, srv_time FROM srvexport
WHERE NOT EXISTS (
SELECT 1 FROM srvexport AS other
- WHERE other.serviceid IN ( ?||'_IN', ?||'_OUT')
+ WHERE other.serviceid IN ( $in, $out )
AND ABS( $_date - $other_date ) <= 60
)
- ORDER BY id
- LIMIT 10
+ ORDER BY srv_date, srv_time
+ LIMIT 100
";
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;
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;
+
+ for my $dir ('_IN', '_OUT') {
+
+ my $sin = join(',', map dbh->quote("$_$dir"), @serviceids);
+
+ my $sum = "
+ SELECT COALESCE(SUM(value),0) FROM srvexport AS other
+ WHERE other.serviceid IN ($sin)
+ 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( @param ) or die $isth->errstr;
+ dbh->commit or die dbh->errstr;
+
+ }
$prev = $cur;
}
myexit() if sigterm() || sigint();
- sleep 60 unless $found;
+ sleep 60; # unless $found;
}
sub _shouldrun {