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

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 0d425c75..16d27cdd 100644
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -16,6 +16,7 @@ use IO::File;
 use DXLog;
 use Time::HiRes qw(gettimeofday tv_interval);
 use Mojo::IOLoop::Subprocess;
+use DXSubprocess;
 
 use strict;
 
@@ -72,19 +73,28 @@ sub cread
 		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("DXCron::cread: adding $_\n") if isdbg('cron');
+
+		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("DXCron::cread: 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
@@ -248,11 +258,10 @@ sub spawn
 	my $t0 = [gettimeofday];
 
 	dbg("DXCron::spawn: $line") if isdbg("cron");
-	my $fc = Mojo::IOLoop::Subprocess->new();
+	my $fc = DXSubprocess->new();
 	$fc->run(
 			 sub {
 				 my @res = `$line`;
-#				 diffms("DXCron spawn 1", $line, $t0, scalar @res) if isdbg('chan');
 				 return @res
 			 },
 			 sub {
@@ -266,7 +275,7 @@ sub spawn
 					 chomp;
 					 dbg("DXCron::spawn: $_") if isdbg("cron");
 				 }
-				 diffms("by DXCron::spawn", $line, $t0, scalar @res) if isdbg('progress');
+				 diffms(__PACKAGE__, "::spawn", $line, $t0, scalar @res) if isdbg('progress');
 			 }
 			);
 }
@@ -274,31 +283,39 @@ sub spawn
 sub spawn_cmd
 {
 	my $line = shift;
+	my $chan = shift || $main::me;
+	my $pkg = ref $chan || __PACKAGE__;
 	my $t0 = [gettimeofday];
-
-	dbg("DXCron::spawn_cmd run: $line") if isdbg('cron');
-	my $fc = Mojo::IOLoop::Subprocess->new();
+	
+	dbg("$pkg::spawn_cmd run: $line") if isdbg('cron');
+	my $fc = DXSubprocess->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');
+				 $chan->{_nospawn} = 1;
+				 my @res = $chan->run_cmd($line);
+				 delete $chan->{_nospawn};
 				 return @res;
 			 },
 			 sub {
 				 my ($fc, $err, @res) = @_; 
 				 if ($err) {
-					 my $s = "DXCron::spawn_cmd: error $err";
+					 chomp $err;
+					 my $s = "$pkg::spawn_cmd: error $err";
 					 dbg($s);
 				 }
 				 for (@res) {
-					 chomp;
-					 dbg("DXCron::spawn_cmd: $_") if isdbg("cron");
+					 if (ref $chan) {
+						 $chan->send($_);
+					 } elsif (isdbg('cron')) {
+						 dbg("$pkg::spawn_cmd: $_");
+					 } else {
+						 last;	# don't care
+					 }
 				 }
-				 diffms("by DXCron::spawn_cmd", $line, $t0, scalar @res) if isdbg('progress');
+				 diffms($pkg, "::spawn_cmd", $line, $t0, scalar @res) if isdbg('progress');
 			 }
 			);
+	return ();
 }
 
 # do an rcmd to another cluster from the crontab