new RBN weighted QRG scoring system.

[spider.git] / perl / DXCron.pm

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 1337919790b910096944a800333339af2ce994a6..2ab02967f8d6dcdf5741af56f3d8525f1bfa1f4a 100644 (file)
--- 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,27 +64,34 @@ 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;
-               
-               $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 {
-                       $err =~ s/^, //;
-                       dbg("DXCron::cread: error $err 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);
@@ -249,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`;
@@ -278,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;
@@ -322,7 +329,7 @@ sub run_cmd
        my @in = $main::me->run_cmd($line);
        dbg("DXCron::run_cmd: $line") if isdbg('cron');
        for (@in) {
-               s/\s*$//og;
+               s/\s*$//;
                dbg("DXCron::cmd out: $_") if isdbg('cron');
        }
 }