use DXDebug;
use IO::File;
use DXLog;
+use Time::HiRes qw(gettimeofday tv_interval);
+use DXSubprocess;
use strict;
-use vars qw{@crontab @lcrontab @scrontab $mtime $lasttime $lastmin};
+use vars qw{@crontab @lcrontab @scrontab $mtime $lasttime $lastmin $use_localtime};
$mtime = 0;
$lasttime = 0;
$lastmin = 0;
-
+$use_localtime = 0;
my $fn = "$main::cmd/crontab";
my $localfn = "$main::localcmd/crontab";
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>) {
+ 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*#/ or $l =~ /^\s*$/;
+ if (my ($ts) = $l =~/^\s*LOCALE\s*=\s*(UTC|LOCAL)/i) {
+ $ts = uc $ts;
+ if ($ts eq 'UTC') {
+ $use_localtime = 0;
+ } elsif ($ts eq 'LOCAL') {
+ $use_localtime = 1;
+ }
+ dbg("DXCron: LOCALE set to $ts") if isdbg('cron');
+ }
+ 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;
-
- $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');
+ 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 {
- dbg("cron: error 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);
# 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
my $now = $main::systime;
return if $now-$lasttime < 1;
- my ($sec, $min, $hour, $mday, $mon, $wday) = (gmtime($now))[0,1,2,3,4,6];
+ my ($sec, $min, $hour, $mday, $mon, $wday);
+ if ($use_localtime) {
+ ($sec, $min, $hour, $mday, $mon, $wday) = (localtime($now))[0,1,2,3,4,6];
+ } else {
+ ($sec, $min, $hour, $mday, $mon, $wday) = (gmtime($now))[0,1,2,3,4,6];
+ }
# are we at a minute boundary?
if ($min != $lastmin) {
(!$cron->{wday} || grep $_ eq $wday, @{$cron->{wday}}) ){
if ($cron->{cmd}) {
- dbg("cron: $min $hour $mday $mon $wday -> doing '$cron->{cmd}'") if isdbg('cron');
- eval "$cron->{cmd}";
+ my $s = $use_localtime ? "LOCALTIME" : "UTC";
+ dbg("cron: $s $min $hour $mday $mon $wday -> doing '$cron->{cmd}'") if isdbg('cron');
+ eval $cron->{cmd};
dbg("cron: cmd error $@") if $@ && isdbg('cron');
}
}
sub spawn
{
my $line = shift;
+ my $t0 = [gettimeofday];
- my $fc = Mojo::IOLoop::ForkCall->new;
+ dbg("DXCron::spawn: $line") if isdbg("cron");
+ my $fc = DXSubprocess->new();
$fc->run(
- sub {my @res = `$line`; return @res},
- undef,
+ sub {
+ my @res = `$line`;
+# diffms("DXCron spawn 1", $line, $t0, scalar @res) if isdbg('chan');
+ return @res
+ },
sub {
my ($fc, $err, @res) = @_;
- if (defined $err) {
+ if ($err) {
my $s = "DXCron::spawn: error $err";
dbg($s);
return;
}
- dbg("DXCron::spawn: $_") for @res;
+ for (@res) {
+ chomp;
+ dbg("DXCron::spawn: $_") if isdbg("cron");
+ }
+ diffms("by DXCron::spawn", $line, $t0, scalar @res) if isdbg('progress');
+ }
+ );
+}
+
+sub spawn_cmd
+{
+ my $line = shift;
+ my $t0 = [gettimeofday];
+
+ dbg("DXCron::spawn_cmd run: $line") if isdbg('cron');
+ my $fc = DXSubprocess->new();
+ $fc->run(
+ sub {
+ ++$main::me->{_nospawn};
+ my @res = $main::me->run_cmd($line);
+# diffms("DXCron spawn_cmd 1", $line, $t0, scalar @res) if isdbg('chan');
+ return @res;
+ },
+ sub {
+ my ($fc, $err, @res) = @_;
+ --$main::me->{_nospawn};
+ $main::me->{_nospawn} = 0 if exists $main::me->{_nospawn} && $main::me->{_nospawn} <= 0;
+ if ($err) {
+ my $s = "DXCron::spawn_cmd: error $err";
+ dbg($s);
+ }
+ for (@res) {
+ chomp;
+ dbg("DXCron::spawn_cmd: $_") if isdbg("cron");
+ }
+ diffms("by DXCron::spawn_cmd", $line, $t0, scalar @res) if isdbg('progress');
}
);
}
sub run_cmd
{
my $line = shift;
- my @in = DXCommandmode::run_cmd($main::me, $line);
- dbg("cmd run: $line") if isdbg('cron');
+ dbg("DXCron::run_cmd: $line") if isdbg('cron');
+ my @in = $main::me->run_cmd($line);
for (@in) {
- s/\s*$//og;
- dbg("cmd out: $_") if isdbg('cron');
+ s/\s*$//;
+ dbg("DXCron::cmd out: $_") if isdbg('cron');
}
}
+
1;
__END__
projects / spider.git / blobdiff