my $found = 0;
- foreach my $torrus_srvderive ( qsearch('torrus_srvderive', {}) ) {
+ SERVICEID: foreach my $torrus_srvderive ( qsearch('torrus_srvderive', {}) ) {
my $serviceid = $torrus_srvderive->serviceid;
}
my $in = join(',', @in);
+ if ( ! $torrus_srvderive->last_srv_date ) {
+ warn "finding initial last_srv_date for $serviceid\n" if $DEBUG;
+ my $dsql = "SELECT srv_date FROM srvexport WHERE serviceid IN ($in)
+ ORDER BY srv_date LIMIT 1";
+ my $dsth = dbh->prepare($dsql) or die $DBI::errstr;
+ $dsth->execute or die $dsth->errstr;
+ my $date = $dsth->fetchrow_arrayref->[0];
+ if ( $date ) {
+ warn "found initial last_srv_date of $date; updating $serviceid\n"
+ if $DEBUG;
+ $torrus_srvderive->last_srv_date($date);
+ my $error = $torrus_srvderive->replace;
+ die $error if $error;
+ } else {
+ warn "no initial last_srv_date for $serviceid; skipping\n" if $DEBUG;
+ next;
+ }
+ }
+
my $ssql = "
$sql AND EXISTS (
SELECT 1 FROM srvexport AS other
warn "executing search\n" if $DEBUG;
- my $alarm = 0;
eval {
- my $h = set_sig_handler( 'ALRM', sub { $alarm = 1; } );
- alarm(5*60); # 15*60);
+ my $h = set_sig_handler( 'ALRM', sub { die "_timeout\n"; } );
+ alarm(10*60); #5*60); #$torrus_srvderive->last_srv_date ? 5*60 : 15*60);
$sth->execute($serviceid, $serviceid) or die $sth->errstr;
alarm(0);
};
alarm(0);
- die $@ if $@;
- if ( $alarm ) {
+ if ( $@ && $@ eq "_timeout\n" ) {
warn "search timed out; reconnecting and restarting\n";
dbh->clone()->do("KILL QUERY ". dbh->{"mysql_thread_id"})
if driver_name eq 'mysql';
+ dbh->rollback; #or die dbh->errstr;
adminsuidsetup($user);
- next MAIN;
+ next SERVICEID; #MAIN;
+ } elsif ( $@ ) {
+ die $@;
}
warn "search executed; checking results\n" if $DEBUG;
$isth->errstr;
dbh->rollback; #or die dbh->errstr;
sleep 5;
- next MAIN;
+ next SERVICEID; #MAIN;
}
}