X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCron.pm;h=9a3aac50495b80716f07a67e7efa93ee921ab04d;hb=refs%2Fheads%2Fnewdisc;hp=1d3dcc6d00b5d3bc1a5aa271f6977f8da7ed1a7d;hpb=b9dffeff7239952814342dad19db3a51def6fab7;p=spider.git

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 1d3dcc6d..9a3aac50 100644
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 1998 - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package DXCron;
@@ -13,6 +13,9 @@ use DXUtil;
 use DXM;
 use DXDebug;
 use IO::File;
+use DXLog;
+use Time::HiRes qw(gettimeofday tv_interval);
+use Mojo::IOLoop::Subprocess;
 
 use strict;
 
@@ -59,7 +62,7 @@ sub cread
 	my $line = 0;
 	my @out;
 
-	dbg("cron: reading $fn\n") if isdbg('cron');
+	dbg("DXCron::cread reading $fn\n") if isdbg('cron');
 	open($fh, $fn) or confess("cron: can't open $fn $!");
 	while (<$fh>) {
 		$line++;
@@ -78,9 +81,9 @@ sub cread
 		if (!$err) {
 			$ref->{cmd} = $cmd;
 			push @out, $ref;
-			dbg("cron: adding $_\n") if isdbg('cron');
+			dbg("DXCron::cread: adding $_\n") if isdbg('cron');
 		} else {
-			dbg("cron: error on line $line '$_'\n") if isdbg('cron');
+			dbg("DXCron::cread: error on line $line '$_'\n") if isdbg('cron');
 		}
 	}
 	close($fh);
@@ -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,60 @@ 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');
-	}
+	my $t0 = [gettimeofday];
+
+	dbg("DXCron::spawn: $line") if isdbg("cron");
+	my $fc = Mojo::IOLoop::Subprocess->new();
+	$fc->run(
+			 sub {
+				 my @res = `$line`;
+#				 diffms("DXCron spawn 1", $line, $t0, scalar @res) if isdbg('chan');
+				 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");
+				 }
+				 diffms("by DXCron::spawn", $line, $t0, scalar @res) if isdbg('chan');
+			 }
+			);
+}
 
-	# coordinate
-	sleep(1);
+sub spawn_cmd
+{
+	my $line = shift;
+	my $t0 = [gettimeofday];
+
+	dbg("DXCron::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};
+#				 diffms("DXCron spawn_cmd 1", $line, $t0, scalar @res) if isdbg('chan');
+				 return @res;
+			 },
+			 sub {
+				 my ($fc, $err, @res) = @_; 
+				 if ($err) {
+					 my $s = "DXCron::spawn_cmd: error $err";
+					 dbg($s);
+				 }
+				 for (@res) {
+					 chomp;
+					 dbg("DXCron::spawn_cmd: $_") if isdbg("cron");
+				 }
+				 diffms("by DXCron::spawn_cmd", $line, $t0, scalar @res) if isdbg('chan');
+			 }
+			);
 }
 
 # do an rcmd to another cluster from the crontab
@@ -286,12 +318,13 @@ sub rcmd
 sub run_cmd
 {
 	my $line = shift;
-	my @in = DXCommandmode::run_cmd($main::me, $line);
-	dbg("cmd run: $line") if isdbg('cron');
+	my @in = $main::me->run_cmd($line);
+	dbg("DXCron::run_cmd: $line") if isdbg('cron');
 	for (@in) {
 		s/\s*$//og;
-		dbg("cmd out: $_") if isdbg('cron');
+		dbg("DXCron::cmd out: $_") if isdbg('cron');
 	}
 }
+
 1;
 __END__