further export bugfixing

[freeside.git] / FS / bin / freeside-queued

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index 56475d0..f6226cc 100644 (file)
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use vars qw( $log_file $sigterm $sigint );
+use vars qw( $log_file $sigterm $sigint $kids $max_kids );
 use subs qw( _die _logmsg );
 use Fcntl qw(:flock);
 use POSIX qw(setsid);
@@ -15,18 +15,22 @@ use FS::queue;
 use FS::cust_main;
 use FS::svc_acct;
 use Net::SSH 0.05;
+use FS::part_export;
 
 my $pid_file = '/var/run/freeside-queued.pid';
 
+$max_kids = '10'; #guess it should be a config file...
+$kids = 0;
+
 my $user = shift or die &usage;
 
-&daemonize;
+&daemonize1;
 
-sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; }
+sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; $kids--; }
 $SIG{CHLD} =  \&REAPER;
 
- $sigterm = 0;
- $sigint = 0;
+$sigterm = 0;
+$sigint = 0;
 $SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $sigint++; };
 $SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $sigterm++; };
 
@@ -37,13 +41,24 @@ adminsuidsetup $user;
 
 $log_file = "/usr/local/etc/freeside/queuelog.". $FS::UID::datasrc;
 
+&daemonize2;
+
 $SIG{__DIE__} = \&_die;
 $SIG{__WARN__} = \&_logmsg;
 
 warn "freeside-queued starting\n";
 
+my $warnkids=0;
 while (1) {
 
+  #prevent runaway forking
+  if ( $kids >= $max_kids ) {
+    warn "WARNING: maximum $kids children reached\n" unless $warnkids++;
+    sleep 1; #waiting for signals is cheap
+    next;
+  }
+  $warnkids=0;
+
   my $job = qsearchs(
     'queue',
     { 'status' => 'new' },
@@ -52,7 +67,7 @@ while (1) {
       ? 'ORDER BY jobnum LIMIT 1 FOR UPDATE'
       : 'ORDER BY jobnum FOR UPDATE LIMIT 1'
   ) or do {
-    sleep 5;
+    sleep 5; #connecting to db is expensive
     next;
   };
 
@@ -64,7 +79,6 @@ while (1) {
 
   my @args = $ljob->args;
 
-  # number of children limit?
   defined( my $pid = fork ) or do {
     warn "WARNING: can't fork: $!\n";
     my %hash = $job->hash;
@@ -73,9 +87,12 @@ while (1) {
     my $ljob = new FS::queue ( \%hash );
     my $error = $ljob->replace($job);
     die $error if $error;
+    next; #don't increment the kid counter
   };
 
-  unless ( $pid ) { #kid time
+  if ( $pid ) {
+    $kids++;
+  } else { #kid time
 
     #get new db handles
     $FS::UID::dbh->{InactiveDestroy} = 1;
@@ -85,7 +102,7 @@ while (1) {
 
     my $eval = "&". $ljob->job. '(@args);';
     warn "running $eval";
-    eval $eval;
+    eval $eval; #throw away return value?  suppose so
     if ( $@ ) {
       warn "job $eval failed";
       my %hash = $ljob->hash;
@@ -133,7 +150,7 @@ sub _logmsg {
   close $log;
 }
 
-sub daemonize {
+sub daemonize1 {
 
   chdir "/" or die "Can't chdir to /: $!";
   open STDIN, '/dev/null'   or die "Can't read /dev/null: $!";
@@ -145,11 +162,18 @@ sub daemonize {
     print $pidfh "$pid\n";
     exit;
   }
+  #open STDOUT, '>/dev/null'
+  #                          or die "Can't write to /dev/null: $!";
+  #setsid                  or die "Can't start a new session: $!";
+  #open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
+
+}
+
+sub daemonize2 {
   open STDOUT, '>/dev/null'
                             or die "Can't write to /dev/null: $!";
   setsid                  or die "Can't start a new session: $!";
   open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
-
 }
 
 =head1 NAME