X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCron.pm;fp=perl%2FDXCron.pm;h=0cc6ce88d85ec36e7fa8617627fb724f41d9bb68;hb=f2c90f82509ae2be33216ebaed3bc9f8ea3f5f80;hp=e60d36b4ba8f02f934c2842a030c57cde11c4cfb;hpb=5fc4f15ca36b6926fac4a8b33b3944cc1f7cef49;p=spider.git diff --git a/perl/DXCron.pm b/perl/DXCron.pm index e60d36b4..0cc6ce88 100644 --- a/perl/DXCron.pm +++ b/perl/DXCron.pm @@ -249,7 +249,6 @@ sub spawn my $fc = Mojo::IOLoop::Subprocess->new(); $fc->run( sub {my @res = `$line`; return @res}, -# [], sub { my ($fc, $err, @res) = @_; if ($err) { @@ -272,8 +271,12 @@ sub spawn_cmd dbg("spawn_cmd run: $line") if isdbg('cron'); my $fc = Mojo::IOLoop::Subprocess->new(); $fc->run( - sub {my @res = DXCommandmode::run_cmd($main::me, $line); return @res}, -# [], + sub { + $main::me->{_nospawn} = 1; + my @res = $main::me->run_cmd($line); + delete $main::me->{_nospawn}; + return @res; + }, sub { my ($fc, $err, @res) = @_; if ($err) { @@ -305,7 +308,7 @@ sub rcmd sub run_cmd { my $line = shift; - my @in = DXCommandmode::run_cmd($main::me, $line); + my @in = $main::me->run_cmd($line); dbg("cmd run: $line") if isdbg('cron'); for (@in) { s/\s*$//og;