X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCron.pm;h=2a02bfd36f75bb340896dbf103637ca27a6c10d1;hb=309eea6bcd4a0eaf25f810168bc38dc348c2a982;hp=c31e46f51d9a4ea47fdc4c885e03ead835ce4d47;hpb=4d03e2c0f1feb9aa6011d6d72b0dd6e95b71da13;p=spider.git diff --git a/perl/DXCron.pm b/perl/DXCron.pm index c31e46f5..2a02bfd3 100644 --- a/perl/DXCron.pm +++ b/perl/DXCron.pm @@ -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,10 +327,10 @@ 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*$//og; + s/\s*$//; dbg("DXCron::cmd out: $_") if isdbg('cron'); } }