fix DXCron, lockout and close_gracefully

[spider.git] / perl / DXCron.pm

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 0c388e9d6aa77af2111dd50e4802cd40c7a68737..2a02bfd36f75bb340896dbf103637ca27a6c10d1 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,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,17 +285,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};
+                                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');
        }
 }