[freeside-commits] freeside/FS/bin freeside-torrus-srvderive, 1.60.2.1, 1.60.2.2

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/bin
In directory wavetail.420.am:/tmp/cvs-serv19159

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	freeside-torrus-srvderive 
Log Message:
have torrus-srvderive just use the native torrus srvderive instead of sucking CPU all day, RT#14559

Index: freeside-torrus-srvderive
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/bin/freeside-torrus-srvderive,v
retrieving revision 1.60.2.1
retrieving revision 1.60.2.2
diff -u -w -d -r1.60.2.1 -r1.60.2.2
--- freeside-torrus-srvderive	23 Sep 2011 23:34:00 -0000	1.60.2.1
+++ freeside-torrus-srvderive	23 Sep 2011 23:45:26 -0000	1.60.2.2
@@ -8,12 +8,11 @@
 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 @@
 
 #--
 
-my $in  = concat_sql([ '?', "'_IN'" ]);
-my $out = concat_sql([ '?', "'_OUT'" ]);
-
 our $kids = 0;
 
 #MAIN: while (1) {
@@ -129,7 +125,7 @@
           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;