X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCron.pm;h=c8b172735a2532b8e574c6c607c75922c305a2ee;hb=8e14149148baba63ce5ae2b95aacda8ab6dd0d87;hp=9a3aac50495b80716f07a67e7efa93ee921ab04d;hpb=ed993b76a84e36b22efd1fc762d6a466497bcf7e;p=spider.git

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 9a3aac50..c8b17273 100644
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -15,16 +15,16 @@ use DXDebug;
 use IO::File;
 use DXLog;
 use Time::HiRes qw(gettimeofday tv_interval);
-use Mojo::IOLoop::Subprocess;
+use DXSubprocess;
 
 use strict;
 
-use vars qw{@crontab @lcrontab @scrontab $mtime $lasttime $lastmin};
+use vars qw{@crontab @lcrontab @scrontab $mtime $lasttime $lastmin $use_localtime};
 
 $mtime = 0;
 $lasttime = 0;
 $lastmin = 0;
-
+$use_localtime = 0;
 
 my $fn = "$main::cmd/crontab";
 my $localfn = "$main::localcmd/crontab";
@@ -64,26 +64,43 @@ sub cread
 
 	dbg("DXCron::cread reading $fn\n") if isdbg('cron');
 	open($fh, $fn) or confess("cron: can't open $fn $!");
-	while (<$fh>) {
+	while (my $l = <$fh>) {
 		$line++;
-		chomp;
-		next if /^\s*#/o or /^\s*$/o;
-		my ($min, $hour, $mday, $month, $wday, $cmd) = /^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.+)$/o;
+		chomp $l;
+		next if $l =~ /^\s*#/ or $l =~ /^\s*$/;
+		if (my ($ts) = $l =~/^\s*LOCALE\s*=\s*(UTC|LOCAL)/i) {
+			$ts = uc $ts;
+			if ($ts eq 'UTC') {
+				$use_localtime = 0;
+			} elsif ($ts eq 'LOCAL') {
+				$use_localtime = 1;
+			}
+			dbg("DXCron: LOCALE set to $ts") if isdbg('cron');
+		}
+		my ($min, $hour, $mday, $month, $wday, $cmd) = $l =~ /^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.+)$/;
 		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');
+		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 $l\n") if isdbg('cron');
+			} else {
+				$err =~ s/^, //;
+				LogDbg('cron', "DXCron::cread: error $err on line $line '$l'");
+			}
 		} else {
-			dbg("DXCron::cread: error on line $line '$_'\n") if isdbg('cron');
+			LogDbg('cron', "DXCron::cread error on line $line '$l'");
+			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);
@@ -102,7 +119,7 @@ sub parse
 	# handle '*' values
 	if ($val eq '*') {
 		$ref->{$sort} = 0;
-		return 0;
+		return '';
 	}
 
 	# handle comma delimited values
@@ -110,20 +127,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
@@ -132,7 +149,12 @@ sub process
 	my $now = $main::systime;
 	return if $now-$lasttime < 1;
 	
-	my ($sec, $min, $hour, $mday, $mon, $wday) = (gmtime($now))[0,1,2,3,4,6];
+	my ($sec, $min, $hour, $mday, $mon, $wday);
+	if ($use_localtime) {
+		($sec, $min, $hour, $mday, $mon, $wday) = (localtime($now))[0,1,2,3,4,6];
+	} else {
+		($sec, $min, $hour, $mday, $mon, $wday) = (gmtime($now))[0,1,2,3,4,6];
+	}
 
 	# are we at a minute boundary?
 	if ($min != $lastmin) {
@@ -150,8 +172,9 @@ sub process
 				(!$cron->{wday} || grep $_ eq $wday, @{$cron->{wday}})	){
 				
 				if ($cron->{cmd}) {
-					dbg("cron: $min $hour $mday $mon $wday -> doing '$cron->{cmd}'") if isdbg('cron');
-					eval "$cron->{cmd}";
+					my $s = $use_localtime ? "LOCALTIME" : "UTC"; 
+					dbg("cron: $s $min $hour $mday $mon $wday -> doing '$cron->{cmd}'") if isdbg('cron');
+					eval $cron->{cmd};
 					dbg("cron: cmd error $@") if $@ && isdbg('cron');
 				}
 			}
@@ -248,7 +271,7 @@ 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`;
@@ -266,7 +289,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');
 			 }
 			);
 }
@@ -277,17 +300,18 @@ sub spawn_cmd
 	my $t0 = [gettimeofday];
 
 	dbg("DXCron::spawn_cmd run: $line") if isdbg('cron');
-	my $fc = Mojo::IOLoop::Subprocess->new();
+	my $fc = DXSubprocess->new();
 	$fc->run(
 			 sub {
-				 $main::me->{_nospawn} = 1;
+				 ++$main::me->{_nospawn};
 				 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) = @_; 
+				 --$main::me->{_nospawn};
+				 $main::me->{_nospawn} = 0 if exists $main::me->{_nospawn} && $main::me->{_nospawn} <= 0;
 				 if ($err) {
 					 my $s = "DXCron::spawn_cmd: error $err";
 					 dbg($s);
@@ -296,7 +320,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');
 			 }
 			);
 }
@@ -318,10 +342,10 @@ sub rcmd
 sub run_cmd
 {
 	my $line = shift;
-	my @in = $main::me->run_cmd($line);
 	dbg("DXCron::run_cmd: $line") if isdbg('cron');
+	my @in = $main::me->run_cmd($line);
 	for (@in) {
-		s/\s*$//og;
+		s/\s*$//;
 		dbg("DXCron::cmd out: $_") if isdbg('cron');
 	}
 }