X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCron.pm;h=4cfabc0eb07ade4c866ce8a1eded6296299b231d;hb=refs%2Fheads%2Fstaging;hp=c31e46f51d9a4ea47fdc4c885e03ead835ce4d47;hpb=4d03e2c0f1feb9aa6011d6d72b0dd6e95b71da13;p=spider.git

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index c31e46f5..4cfabc0e 100644
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -68,7 +68,7 @@ sub cread
 		$line++;
 		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;
+		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 = '';
@@ -110,7 +110,7 @@ sub parse
 	# handle '*' values
 	if ($val eq '*') {
 		$ref->{$sort} = 0;
-		return;
+		return '';
 	}
 
 	# handle comma delimited values
@@ -131,7 +131,7 @@ sub parse
 	}
 	$ref->{$sort} = \@req;
 	
-	return;
+	return '';
 }
 
 # process the cronjobs
@@ -159,7 +159,7 @@ sub process
 				
 				if ($cron->{cmd}) {
 					dbg("cron: $min $hour $mday $mon $wday -> doing '$cron->{cmd}'") if isdbg('cron');
-					eval "$cron->{cmd}";
+					eval $cron->{cmd};
 					dbg("cron: cmd error $@") if $@ && isdbg('cron');
 				}
 			}
@@ -288,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);
@@ -326,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');
 	}
 }