X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCron.pm;h=2a02bfd36f75bb340896dbf103637ca27a6c10d1;hb=309eea6bcd4a0eaf25f810168bc38dc348c2a982;hp=b0d4b1c6dc6609c158cd3568cd5ce2e168f9ce9b;hpb=9d190c7619d08c4d2e82b8ec3a9e5c84dac9b26a;p=spider.git

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index b0d4b1c6..2a02bfd3 100644
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -64,14 +64,14 @@ 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*#/o or $l =~ /^\s*$/o;
+		my ($min, $hour, $mday, $month, $wday, $cmd) = $l =~ /^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.+)$/o;
 		next unless defined $min;
 		my $ref = bless {};
-		my $err;
+		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);
@@ -82,18 +82,17 @@ sub cread
 			if (!$err) {
 				$ref->{cmd} = $cmd;
 				push @out, $ref;
-				dbg("DXCron::cread: adding $_\n") if isdbg('cron');
+				dbg("DXCron::cread: adding $l\n") if isdbg('cron');
 			} else {
 				$err =~ s/^, //;
-				LogDbg('cron', "DXCron::cread: error $err on line $line '$_'");
+				LogDbg('cron', "DXCron::cread: error $err on line $line '$l'");
 			}
 		} else {
-			LogDbg('cron', "DXCron::cread error on line $line '$_'");
+			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);
 	return @out;
@@ -289,14 +288,15 @@ sub spawn_cmd
 	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};
+				 delete $main::me->{_nospawn} if exists $main::me->{_nospawn} && $main::me->{_nospawn} <= 0;
 				 if ($err) {
 					 my $s = "DXCron::spawn_cmd: error $err";
 					 dbg($s);
@@ -327,10 +327,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');
 	}
 }