X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCron.pm;h=5cccfc491d5bba66a0431986fe3cc38f4c1a5479;hb=refs%2Fheads%2Fnewusers;hp=e60d36b4ba8f02f934c2842a030c57cde11c4cfb;hpb=5fc4f15ca36b6926fac4a8b33b3944cc1f7cef49;p=spider.git

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index e60d36b4..5cccfc49 100644
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -14,8 +14,9 @@ use DXM;
 use DXDebug;
 use IO::File;
 use DXLog;
-
+use Time::HiRes qw(gettimeofday tv_interval);
 use Mojo::IOLoop::Subprocess;
+use DXSubprocess;
 
 use strict;
 
@@ -62,7 +63,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++;
@@ -71,20 +72,29 @@ sub cread
 		my ($min, $hour, $mday, $month, $wday, $cmd) = /^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.+)$/o;
 		next unless defined $min;
 		my $ref = bless {};
-		my $err;
-		
-		$err |= parse($ref, 'min', $min, 0, 60);
-		$err |= parse($ref, 'hour', $hour, 0, 23);
-		$err |= parse($ref, 'mday', $mday, 1, 31);
-		$err |= parse($ref, 'month', $month, 1, 12, "jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec");
-		$err |= parse($ref, 'wday', $wday, 0, 6, "sun", "mon", "tue", "wed", "thu", "fri", "sat");
-		if (!$err) {
-			$ref->{cmd} = $cmd;
-			push @out, $ref;
-			dbg("cron: adding $_\n") if isdbg('cron');
+		my $err = '';
+
+		if (defined $min && defined $hour && defined $cmd) { # it isn't all of them, but should be enough to tell if this is a real line
+			$err .= parse($ref, 'min', $min, 0, 60);
+			$err .= parse($ref, 'hour', $hour, 0, 23);
+			$err .= parse($ref, 'mday', $mday, 1, 31);
+			$err .= parse($ref, 'month', $month, 1, 12, "jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec");
+			$err .= parse($ref, 'wday', $wday, 0, 6, "sun", "mon", "tue", "wed", "thu", "fri", "sat");
+			if (!$err) {
+				$ref->{cmd} = $cmd;
+				push @out, $ref;
+				dbg("DXCron::cread: adding $_\n") if isdbg('cron');
+			} else {
+				$err =~ s/^, //;
+				LogDbg('cron', "DXCron::cread: error $err on line $line '$_'");
+			}
 		} else {
-			dbg("cron: error on line $line '$_'\n") if isdbg('cron');
+			LogDbg('cron', "DXCron::cread error on line $line '$_'");
+			my @s = ($min, $hour, $mday, $month, $wday, $cmd);
+			my $s = "line $line splits as " . join(', ', (map {defined $_ ? qq{$_} : q{'undef'}} @s));
+			LogDbg('cron', $s);
 		}
+		
 	}
 	close($fh);
 	return @out;
@@ -102,7 +112,7 @@ sub parse
 	# handle '*' values
 	if ($val eq '*') {
 		$ref->{$sort} = 0;
-		return 0;
+		return;
 	}
 
 	# handle comma delimited values
@@ -110,20 +120,20 @@ sub parse
 	for (@comma) {
 		my @minus = split /-/o;
 		if (@minus == 2) {
-			return 1 if $minus[0] < $low || $minus[0] > $high;
-			return 1 if $minus[1] < $low || $minus[1] > $high;
+			return  ", $sort should be $low >= $minus[0] <= $high" if $minus[0] < $low || $minus[0] > $high;
+			return  ", $sort should be $low >= $minus[1] <= $high" if $minus[1] < $low || $minus[1] > $high;
 			my $i;
 			for ($i = $minus[0]; $i <= $minus[1]; ++$i) {
 				push @req, 0 + $i; 
 			}
 		} else {
-			return 1 if $_ < $low || $_ > $high;
+			return ", $sort should be $low >= $val <= $high" if $_ < $low || $_ > $high;
 			push @req, 0 + $_;
 		}
 	}
 	$ref->{$sort} = \@req;
 	
-	return 0;
+	return;
 }
 
 # process the cronjobs
@@ -245,11 +255,15 @@ sub start_connect
 sub spawn
 {
 	my $line = shift;
+	my $t0 = [gettimeofday];
 
-	my $fc = Mojo::IOLoop::Subprocess->new();
+	dbg("DXCron::spawn: $line") if isdbg("cron");
+	my $fc = DXSubprocess->new();
 	$fc->run(
-			 sub {my @res = `$line`; return @res},
-#			 [],
+			 sub {
+				 my @res = `$line`;
+				 return @res
+			 },
 			 sub {
 				 my ($fc, $err, @res) = @_; 
 				 if ($err) {
@@ -261,6 +275,7 @@ sub spawn
 					 chomp;
 					 dbg("DXCron::spawn: $_") if isdbg("cron");
 				 }
+				 diffms(__PACKAGE__, "::spawn", $line, $t0, scalar @res) if isdbg('progress');
 			 }
 			);
 }
@@ -268,24 +283,39 @@ sub spawn
 sub spawn_cmd
 {
 	my $line = shift;
-
-	dbg("spawn_cmd run: $line") if isdbg('cron');
-	my $fc = Mojo::IOLoop::Subprocess->new();
+	my $chan = shift || $main::me;
+	my $pkg = ref $chan || __PACKAGE__;
+	my $t0 = [gettimeofday];
+	
+	dbg("$pkg::spawn_cmd run: $line") if isdbg('cron');
+	my $fc = DXSubprocess->new;
 	$fc->run(
-			 sub {my @res = DXCommandmode::run_cmd($main::me, $line); return @res},
-#			 [],
+			 sub {
+				 $chan->{_nospawn} = 1;
+				 my @res = $chan->run_cmd($line);
+				 delete $chan->{_nospawn};
+				 return @res;
+			 },
 			 sub {
 				 my ($fc, $err, @res) = @_; 
 				 if ($err) {
-					 my $s = "spawn_cmd: error $err";
+					 chomp $err;
+					 my $s = "$pkg::spawn_cmd: error $err";
 					 dbg($s);
 				 }
 				 for (@res) {
-					 chomp;
-					 dbg("spawn_cmd: $_") if isdbg("cron");
+					 if (ref $chan) {
+						 $chan->send($_);
+					 } elsif (isdbg('cron')) {
+						 dbg("$pkg::spawn_cmd: $_");
+					 } else {
+						 last;	# don't care
+					 }
 				 }
+				 diffms($pkg, "::spawn_cmd", $line, $t0, scalar @res) if isdbg('progress');
 			 }
 			);
+	return ();
 }
 
 # do an rcmd to another cluster from the crontab
@@ -305,11 +335,11 @@ 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');
 	}
 }