From 2c3746c69b614f612a532a183c68d2c077cbcb1a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 10 Jun 2011 23:51:23 +0000
Subject: [PATCH] alternate (hopefully more efficient) path: if we're more than
 a day behind, call native torrus srvderive, RT#10574

---
 FS/bin/freeside-torrus-srvderive | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/FS/bin/freeside-torrus-srvderive b/FS/bin/freeside-torrus-srvderive
index 258385173..9201b0585 100644
--- a/FS/bin/freeside-torrus-srvderive
+++ b/FS/bin/freeside-torrus-srvderive
@@ -150,11 +150,15 @@ while (1) {
         #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
@@ -165,7 +169,9 @@ while (1) {
                     );
 
           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;
-- 
2.11.0