X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCron.pm;h=0c388e9d6aa77af2111dd50e4802cd40c7a68737;hb=3b932bf2afb86d5373c68ada44bb8f5eb642514f;hp=9a3aac50495b80716f07a67e7efa93ee921ab04d;hpb=ed993b76a84e36b22efd1fc762d6a466497bcf7e;p=spider.git

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 9a3aac50..0c388e9d 100644
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -72,19 +72,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 +111,7 @@ sub parse
 	# handle '*' values
 	if ($val eq '*') {
 		$ref->{$sort} = 0;
-		return 0;
+		return;
 	}
 
 	# handle comma delimited values
@@ -110,20 +119,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
@@ -266,7 +275,7 @@ sub spawn
 					 chomp;
 					 dbg("DXCron::spawn: $_") if isdbg("cron");
 				 }
-				 diffms("by DXCron::spawn", $line, $t0, scalar @res) if isdbg('chan');
+				 diffms("by DXCron::spawn", $line, $t0, scalar @res) if isdbg('progress');
 			 }
 			);
 }
@@ -296,7 +305,7 @@ sub spawn_cmd
 					 chomp;
 					 dbg("DXCron::spawn_cmd: $_") if isdbg("cron");
 				 }
-				 diffms("by DXCron::spawn_cmd", $line, $t0, scalar @res) if isdbg('chan');
+				 diffms("by DXCron::spawn_cmd", $line, $t0, scalar @res) if isdbg('progress');
 			 }
 			);
 }