X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCron.pm;h=ae9feb32000c1e09c84d8403ce4a651432ddaca6;hb=d6be28a3da4f40fcba1c2f0161ac48a38378a103;hp=f9a4f07ea12585ab62b30389b1c4734d341fa2eb;hpb=12041dbf48c9a02a60c44b665227e185bc5590a4;p=spider.git

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index f9a4f07e..ae9feb32 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,13 +246,13 @@ sub spawn
 {
 	my $line = shift;
 
-	my $fc = Mojo::IOLoop::ForkCall->new;
+	dbg("DXCron::spawn: $line") if isdbg("cron");
+	my $fc = Mojo::IOLoop::Subprocess->new();
 	$fc->run(
 			 sub {my @res = `$line`; return @res},
-			 [],
 			 sub {
 				 my ($fc, $err, @res) = @_; 
-				 if (defined $err) {
+				 if ($err) {
 					 my $s = "DXCron::spawn: error $err";
 					 dbg($s);
 					 return;
@@ -263,6 +265,33 @@ sub spawn
 			);
 }
 
+sub spawn_cmd
+{
+	my $line = shift;
+
+	dbg("spawn_cmd run: $line") if isdbg('cron');
+	my $fc = Mojo::IOLoop::Subprocess->new();
+	$fc->run(
+			 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) {
+					 my $s = "spawn_cmd: error $err";
+					 dbg($s);
+				 }
+				 for (@res) {
+					 chomp;
+					 dbg("spawn_cmd: $_") if isdbg("cron");
+				 }
+			 }
+			);
+}
+
 # do an rcmd to another cluster from the crontab
 sub rcmd
 {
@@ -280,12 +309,13 @@ 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;
 		dbg("cmd out: $_") if isdbg('cron');
 	}
 }
+
 1;
 __END__