X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCron.pm;h=b908af3c6751a1791ac6cf6d2785b13aaba035f2;hb=cc9bd946788545ef87a7a6d0541fa1c47b9b034a;hp=2ab02967f8d6dcdf5741af56f3d8525f1bfa1f4a;hpb=cb319a377cdf61f610b57bb1336eba1b5873db2b;p=spider.git diff --git a/perl/DXCron.pm b/perl/DXCron.pm index 2ab02967..b908af3c 100644 --- a/perl/DXCron.pm +++ b/perl/DXCron.pm @@ -159,7 +159,7 @@ sub process if ($cron->{cmd}) { dbg("cron: $min $hour $mday $mon $wday -> doing '$cron->{cmd}'") if isdbg('cron'); - eval "$cron->{cmd}"; + eval $cron->{cmd}; dbg("cron: cmd error $@") if $@ && isdbg('cron'); } } @@ -288,14 +288,15 @@ sub spawn_cmd my $fc = DXSubprocess->new(); $fc->run( sub { - $main::me->{_nospawn} = 1; + ++$main::me->{_nospawn}; my @res = $main::me->run_cmd($line); - delete $main::me->{_nospawn}; # diffms("DXCron spawn_cmd 1", $line, $t0, scalar @res) if isdbg('chan'); return @res; }, sub { my ($fc, $err, @res) = @_; + --$main::me->{_nospawn}; + delete $main::me->{_nospawn} if exists $main::me->{_nospawn} && $main::me->{_nospawn} <= 0; if ($err) { my $s = "DXCron::spawn_cmd: error $err"; dbg($s); @@ -326,8 +327,8 @@ sub rcmd sub run_cmd { my $line = shift; - my @in = $main::me->run_cmd($line); dbg("DXCron::run_cmd: $line") if isdbg('cron'); + my @in = $main::me->run_cmd($line); for (@in) { s/\s*$//; dbg("DXCron::cmd out: $_") if isdbg('cron');