projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[spider.git]
/
perl
/
DXCron.pm
diff --git
a/perl/DXCron.pm
b/perl/DXCron.pm
index 507a6a12a81053d9de0e6f136da6381beb73cce6..d2e434bcbbd5bc1d1a4555ec7dd101e0d3d729a3 100644
(file)
--- a/
perl/DXCron.pm
+++ b/
perl/DXCron.pm
@@
-12,7
+12,7
@@
use DXVars;
use DXUtil;
use DXM;
use DXDebug;
use DXUtil;
use DXM;
use DXDebug;
-use
FileHand
le;
+use
IO::Fi
le;
use Carp;
use strict;
use Carp;
use strict;
@@
-58,7
+58,7
@@
sub init
sub cread
{
my $fn = shift;
sub cread
{
my $fn = shift;
- my $fh = new
FileHand
le;
+ my $fh = new
IO::Fi
le;
my $line = 0;
dbg('cron', "cron: reading $fn\n");
my $line = 0;
dbg('cron', "cron: reading $fn\n");
@@
-234,6
+234,11
@@
sub start_connect
my $call = uc shift;
my $lccall = lc $call;
my $call = uc shift;
my $lccall = lc $call;
+ if (grep {$_->{call} eq $call} @main::outstanding_connects) {
+ dbg('cron', "Connect not started, outstanding connect to $call");
+ return;
+ }
+
my $prog = "$main::root/local/client.pl";
$prog = "$main::root/perl/client.pl" if ! -e $prog;
my $prog = "$main::root/local/client.pl";
$prog = "$main::root/perl/client.pl" if ! -e $prog;
@@
-247,8
+252,7
@@
sub start_connect
alarm(0);
DXChannel::closeall();
$SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT';
alarm(0);
DXChannel::closeall();
$SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT';
- exec $prog, $call, 'connect';
- dbg('cron', "exec '$prog' failed $!");
+ exec $prog, $call, 'connect' or dbg('cron', "exec '$prog' failed $!");
}
dbg('cron', "connect to $call started");
} else {
}
dbg('cron', "connect to $call started");
} else {
@@
-274,8
+278,7
@@
sub spawn
alarm(0);
DXChannel::closeall();
$SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT';
alarm(0);
DXChannel::closeall();
$SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT';
- exec "$line";
- dbg('cron', "exec '$line' failed $!");
+ exec "$line" or dbg('cron', "exec '$line' failed $!");
}
dbg('cron', "spawn of $line started");
} else {
}
dbg('cron', "spawn of $line started");
} else {