X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-torrus-srvderive;h=5ad23aba45cee579194db88de85a862b9af587a2;hp=12135d5ff062b361ac1d889be343be2cd5230069;hb=6de06472ab43534bd889e531ae060bbd4c935518;hpb=6ead033e93fe7fa4152bb1e3147145a61db3584d

diff --git a/FS/bin/freeside-torrus-srvderive b/FS/bin/freeside-torrus-srvderive
index 12135d5ff..5ad23aba4 100644
--- a/FS/bin/freeside-torrus-srvderive
+++ b/FS/bin/freeside-torrus-srvderive
@@ -8,12 +8,11 @@ use Date::Format;
 use IPC::Run qw( run ); #timeout );
 use FS::Daemon ':all'; #daemonize1 drop_root daemonize2 myexit logfile sig*
 use FS::UID qw( adminsuidsetup forksuidsetup dbh driver_name );
-use FS::Record qw( qsearch str2time_sql str2time_sql_closing concat_sql );
+use FS::Record qw( qsearch );
 use FS::torrus_srvderive;
 
 our $DEBUG = 2;
 our $max_kids = 4;
-our $search_timeout = 2*60*60; #60*60; #30*60; # 15*60 5*60; #$torrus_srvderive->last_srv_date ? 5*60 : 15*60);
 our %kids;
 
 my $user = shift or die &usage;
@@ -35,9 +34,6 @@ die "not running: network_monitoring_system not Torrus_Internal\n"
 
 #--
 
-my $in  = concat_sql([ '?', "'_IN'" ]);
-my $out = concat_sql([ '?', "'_OUT'" ]);
-
 our $kids = 0;
 
 #MAIN: while (1) {
@@ -86,7 +82,8 @@ while (1) {
                     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];
+        my $row = $dsth->fetchrow_arrayref;
+        my $date = (defined($row) && ref($row)) ? $row->[0] : '';
         if ( $date ) {
           warn "found initial last_srv_date of $date; updating $serviceid\n"
             if $DEBUG;
@@ -129,7 +126,7 @@ while (1) {
           warn "calling native srvderive: ". join(' ', @cmd). "\n" if $DEBUG;
           my $out_and_err = '';
           run( \@cmd, '>&', \$out_and_err ) #verbose?  timeout?
-            or die "error calling native srvder: $out_and_err\n";
+            or die "error calling native srvderive: $out_and_err\n";
 
         }
         warn "native srvderive done" if $DEBUG;