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

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index f9a4f07e..0d425c75 100644
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -14,6 +14,8 @@ use DXM;
 use DXDebug;
 use IO::File;
 use DXLog;
+use Time::HiRes qw(gettimeofday tv_interval);
+use Mojo::IOLoop::Subprocess;
 
 use strict;
 
@@ -60,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++;
@@ -79,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);
@@ -243,14 +245,19 @@ sub start_connect
 sub spawn
 {
 	my $line = shift;
+	my $t0 = [gettimeofday];
 
-	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 @res = `$line`;
+#				 diffms("DXCron spawn 1", $line, $t0, scalar @res) if isdbg('chan');
+				 return @res
+			 },
 			 sub {
 				 my ($fc, $err, @res) = @_; 
-				 if (defined $err) {
+				 if ($err) {
 					 my $s = "DXCron::spawn: error $err";
 					 dbg($s);
 					 return;
@@ -259,6 +266,37 @@ sub spawn
 					 chomp;
 					 dbg("DXCron::spawn: $_") if isdbg("cron");
 				 }
+				 diffms("by DXCron::spawn", $line, $t0, scalar @res) if isdbg('progress');
+			 }
+			);
+}
+
+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('progress');
 			 }
 			);
 }
@@ -280,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__