projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6ead033
)
have torrus-srvderive just use the native torrus srvderive instead of sucking CPU...
author
ivan
<ivan>
Fri, 23 Sep 2011 23:45:26 +0000
(23:45 +0000)
committer
ivan
<ivan>
Fri, 23 Sep 2011 23:45:26 +0000
(23:45 +0000)
FS/bin/freeside-torrus-srvderive
patch
|
blob
|
history
diff --git
a/FS/bin/freeside-torrus-srvderive
b/FS/bin/freeside-torrus-srvderive
index
12135d5
..
56535f9
100644
(file)
--- 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 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;
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;
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) {
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?
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 srvder
ive
: $out_and_err\n";
}
warn "native srvderive done" if $DEBUG;
}
warn "native srvderive done" if $DEBUG;