add start of torrus srvderive daemon, RT#10574

[freeside.git] / FS / bin / freeside-torrus-srvderive

diff --git a/FS/bin/freeside-torrus-srvderive b/FS/bin/freeside-torrus-srvderive
index 34e5ac5..50dcb92 100644 (file)
--- a/FS/bin/freeside-torrus-srvderive
+++ b/FS/bin/freeside-torrus-srvderive
@@ -7,7 +7,7 @@ use FS::UID qw( adminsuidsetup dbh driver_name );
 use FS::Record qw( qsearch str2time_sql str2time_sql_closing concat_sql );
 use FS::torrus_srvderive;
 
-our $DEBUG = 1;
+our $DEBUG = 2;
 
 my $user = shift or die &usage;
 $FS::Daemon::PID_NEWSTYLE = 1;
@@ -39,28 +39,34 @@ my $other_date = concat_sql([ 'other.srv_date', "' '", 'other.srv_time' ]);
 $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
 ";
 
 while (1) {
 
-  #my $found = 0;
+  my $found = 0;
 
   foreach my $torrus_srvderive ( qsearch('torrus_srvderive', {}) ) {
 
     my $serviceid = $torrus_srvderive->serviceid;
 
+    warn $sql if $DEBUG > 1;
     my $sth = dbh->prepare($sql) or die $DBI::errstr; #better recovery?
     $sth->execute($serviceid, $serviceid) or die $sth->errstr;
     my $prev = 0;
     while ( my $row = $sth->fetchrow_arrayref ) {
+      $found++;
       my( $srv_date, $srv_time ) = @$row;
       my $cur = str2time( "$srv_date $srv_time" );
       next if $cur-$prev <= 60;
@@ -76,7 +82,7 @@ while (1) {
 
 
   myexit() if sigterm() || sigint();
-  sleep 60; #unless $found
+  sleep 60 unless $found;
 }
 
 sub _shouldrun {