X-Git-Url: http://scm.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCron.pm;h=e60d36b4ba8f02f934c2842a030c57cde11c4cfb;hb=5fc4f15ca36b6926fac4a8b33b3944cc1f7cef49;hp=ccbb78d4773a6a7466e81a6625e968cd15ffca92;hpb=0144bfc7a3550b04e9f319ae3d19f12c532f380e;p=spider.git diff --git a/perl/DXCron.pm b/perl/DXCron.pm index ccbb78d4..e60d36b4 100644 --- a/perl/DXCron.pm +++ b/perl/DXCron.pm @@ -15,6 +15,8 @@ use DXDebug; use IO::File; use DXLog; +use Mojo::IOLoop::Subprocess; + use strict; use vars qw{@crontab @lcrontab @scrontab $mtime $lasttime $lastmin}; @@ -244,18 +246,44 @@ sub spawn { my $line = shift; - my $fc = Mojo::IOLoop::ForkCall->new; + my $fc = Mojo::IOLoop::Subprocess->new(); $fc->run( sub {my @res = `$line`; return @res}, - undef, +# [], sub { my ($fc, $err, @res) = @_; - if (defined $err) { + if ($err) { my $s = "DXCron::spawn: error $err"; dbg($s); return; } - dbg($_) for @res; + for (@res) { + chomp; + dbg("DXCron::spawn: $_") if isdbg("cron"); + } + } + ); +} + +sub spawn_cmd +{ + my $line = shift; + + 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 { + my ($fc, $err, @res) = @_; + if ($err) { + my $s = "spawn_cmd: error $err"; + dbg($s); + } + for (@res) { + chomp; + dbg("spawn_cmd: $_") if isdbg("cron"); + } } ); } @@ -284,5 +312,6 @@ sub run_cmd dbg("cmd out: $_") if isdbg('cron'); } } + 1; __END__