X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCron.pm;h=c31e46f51d9a4ea47fdc4c885e03ead835ce4d47;hb=b1f9b4650ed8fdeb1e03834f076f3040ce65776a;hp=0c388e9d6aa77af2111dd50e4802cd40c7a68737;hpb=2b89a309f1c5658fbadac1a5d3e5e03d541e1005;p=spider.git

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 0c388e9d..c31e46f5 100644
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -15,7 +15,7 @@ use DXDebug;
 use IO::File;
 use DXLog;
 use Time::HiRes qw(gettimeofday tv_interval);
-use Mojo::IOLoop::Subprocess;
+use DXSubprocess;
 
 use strict;
 
@@ -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;
@@ -257,7 +256,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`;
@@ -286,7 +285,7 @@ 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;