summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivan <ivan>2011-09-23 23:45:26 +0000
committerivan <ivan>2011-09-23 23:45:26 +0000
commit1c02da48b24e5a09be0179dadfc8754e535ab221 (patch)
tree6fb4556f10e27d7bd2bea9880e41478e26b841bf
parent6ead033e93fe7fa4152bb1e3147145a61db3584d (diff)
have torrus-srvderive just use the native torrus srvderive instead of sucking CPU all day, RT#14559
-rw-r--r--FS/bin/freeside-torrus-srvderive8
1 files changed, 2 insertions, 6 deletions
diff --git a/FS/bin/freeside-torrus-srvderive b/FS/bin/freeside-torrus-srvderive
index 12135d5ff..56535f95d 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) {
@@ -129,7 +125,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;