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

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 2c02be53..ae9feb32 100644
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -13,6 +13,9 @@ use DXUtil;
 use DXM;
 use DXDebug;
 use IO::File;
+use DXLog;
+
+use Mojo::IOLoop::Subprocess;
 
 use strict;
 
@@ -219,7 +222,7 @@ sub last_connect
 {
 	my $call = uc shift;
 	return $main::systime if DXChannel::get($call);
-	my $user = DXUser->get($call);
+	my $user = DXUser::get($call);
 	return $user ? $user->lastin : 0;
 }
 
@@ -242,31 +245,51 @@ sub start_connect
 sub spawn
 {
 	my $line = shift;
-	
-	my $pid = fork();
-	if (defined $pid) {
-		if (!$pid) {
-			# in child, unset warnings, disable debugging and general clean up from us
-			$^W = 0;
-			eval "{ package DB; sub DB {} }";
-			DXChannel::closeall();
-			for (@main::listeners) {
-				$_->close_server;
-			}
-			unless ($main::is_win) {
-				$SIG{HUP} = 'IGNORE';
-				$SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT';
-				alarm(0);
-			}
-			exec "$line" or dbg("exec '$line' failed $!") if isdbg('cron');
-		}
-		dbg("spawn of $line started") if isdbg('cron');
-	} else {
-		dbg("can't fork for $line $!") if isdbg('cron');
-	}
 
-	# coordinate
-	sleep(1);
+	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 ($err) {
+					 my $s = "DXCron::spawn: error $err";
+					 dbg($s);
+					 return;
+				 }
+				 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 {
+				 $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
@@ -286,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__