use DXM;
use DXDebug;
use IO::File;
+use DXLog;
+use Time::HiRes qw(gettimeofday tv_interval);
+use Mojo::IOLoop::Subprocess;
+use DXSubprocess;
use strict;
my $line = 0;
my @out;
- dbg("cron: reading $fn\n") if isdbg('cron');
+ dbg("DXCron::cread reading $fn\n") if isdbg('cron');
open($fh, $fn) or confess("cron: can't open $fn $!");
while (<$fh>) {
$line++;
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("cron: adding $_\n") if isdbg('cron');
+
+ 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 $_\n") if isdbg('cron');
+ } else {
+ $err =~ s/^, //;
+ LogDbg('cron', "DXCron::cread: error $err on line $line '$_'");
+ }
} else {
- dbg("cron: error on line $line '$_'\n") if isdbg('cron');
+ LogDbg('cron', "DXCron::cread error on line $line '$_'");
+ 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;
# handle '*' values
if ($val eq '*') {
$ref->{$sort} = 0;
- return 0;
+ return;
}
# handle comma delimited values
for (@comma) {
my @minus = split /-/o;
if (@minus == 2) {
- return 1 if $minus[0] < $low || $minus[0] > $high;
- return 1 if $minus[1] < $low || $minus[1] > $high;
+ return ", $sort should be $low >= $minus[0] <= $high" if $minus[0] < $low || $minus[0] > $high;
+ return ", $sort should be $low >= $minus[1] <= $high" if $minus[1] < $low || $minus[1] > $high;
my $i;
for ($i = $minus[0]; $i <= $minus[1]; ++$i) {
push @req, 0 + $i;
}
} else {
- return 1 if $_ < $low || $_ > $high;
+ return ", $sort should be $low >= $val <= $high" if $_ < $low || $_ > $high;
push @req, 0 + $_;
}
}
$ref->{$sort} = \@req;
- return 0;
+ return;
}
# process the cronjobs
sub spawn
{
my $line = shift;
-
- my $pid = fork();
- if (defined $pid) {
- if (!$pid) {
- # in child, unset warnings, disable debugging and general clean up from us
- $^W = 0;
- eval "{ package DB; sub DB {} }";
- dbgclose();
- Logclose();
- DXChannel::closeall();
- for (@main::listeners) {
- $_->close_server;
- }
- unless ($main::is_win) {
- $SIG{HUP} = 'IGNORE';
- $SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT';
- alarm(0);
- }
- exec "$line" or dbg("exec '$line' failed $!") if isdbg('cron');
- }
- dbg("spawn of $line started") if isdbg('cron');
- } else {
- dbg("can't fork for $line $!") if isdbg('cron');
- }
+ my $t0 = [gettimeofday];
+
+ dbg("DXCron::spawn: $line") if isdbg("cron");
+ my $fc = DXSubprocess->new();
+ $fc->run(
+ sub {
+ my @res = `$line`;
+ return @res
+ },
+ sub {
+ my ($fc, $err, @res) = @_;
+ if ($err) {
+ my $s = "DXCron::spawn: error $err";
+ dbg($s);
+ return;
+ }
+ for (@res) {
+ chomp;
+ dbg("DXCron::spawn: $_") if isdbg("cron");
+ }
+ diffms(__PACKAGE__, "::spawn", $line, $t0, scalar @res) if isdbg('progress');
+ }
+ );
+}
- # coordinate
- sleep(1);
+sub spawn_cmd
+{
+ my $line = shift;
+ my $chan = shift || $main::me;
+ my $pkg = ref $chan || __PACKAGE__;
+ my $t0 = [gettimeofday];
+
+ dbg("$pkg::spawn_cmd run: $line") if isdbg('cron');
+ my $fc = DXSubprocess->new;
+ $fc->run(
+ sub {
+ $chan->{_nospawn} = 1;
+ my @res = $chan->run_cmd($line);
+ delete $chan->{_nospawn};
+ return @res;
+ },
+ sub {
+ my ($fc, $err, @res) = @_;
+ if ($err) {
+ chomp $err;
+ my $s = "$pkg::spawn_cmd: error $err";
+ dbg($s);
+ }
+ for (@res) {
+ if (ref $chan) {
+ dbg("send: $_");
+ $chan->send($_);
+ } elsif (isdbg('cron')) {
+ dbg("$pkg::spawn_cmd: $_");
+ } else {
+ last; # don't care
+ }
+ }
+ diffms($pkg, "::spawn_cmd", $line, $t0, scalar @res) if isdbg('progress');
+ }
+ );
}
# do an rcmd to another cluster from the crontab
sub run_cmd
{
my $line = shift;
- my @in = DXCommandmode::run_cmd($main::me, $line);
- dbg("cmd run: $line") if isdbg('cron');
+ my @in = $main::me->run_cmd($line);
+ dbg("DXCron::run_cmd: $line") if isdbg('cron');
for (@in) {
s/\s*$//og;
- dbg("cmd out: $_") if isdbg('cron');
+ dbg("DXCron::cmd out: $_") if isdbg('cron');
}
}
+
1;
__END__