X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCron.pm;h=b908af3c6751a1791ac6cf6d2785b13aaba035f2;hb=cc9bd946788545ef87a7a6d0541fa1c47b9b034a;hp=870c395e217ea156269ef668bc33c3c3a4c71e53;hpb=6624dcdf07d628e8d6a16fc6549edf40be25b7b2;p=spider.git diff --git a/perl/DXCron.pm b/perl/DXCron.pm index 870c395e..b908af3c 100644 --- a/perl/DXCron.pm +++ b/perl/DXCron.pm @@ -3,7 +3,7 @@ # # Copyright (c) 1998 - Dirk Koopman G1TLH # -# $Id$ +# # package DXCron; @@ -13,6 +13,9 @@ use DXUtil; use DXM; use DXDebug; use IO::File; +use DXLog; +use Time::HiRes qw(gettimeofday tv_interval); +use DXSubprocess; use strict; @@ -59,28 +62,36 @@ sub cread 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*#/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("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); @@ -99,7 +110,7 @@ sub parse # handle '*' values if ($val eq '*') { $ref->{$sort} = 0; - return 0; + return; } # handle comma delimited values @@ -107,20 +118,20 @@ sub parse 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 @@ -148,7 +159,7 @@ sub process if ($cron->{cmd}) { dbg("cron: $min $hour $mday $mon $wday -> doing '$cron->{cmd}'") if isdbg('cron'); - eval "$cron->{cmd}"; + eval $cron->{cmd}; dbg("cron: cmd error $@") if $@ && isdbg('cron'); } } @@ -168,7 +179,7 @@ sub process sub connected { my $call = uc shift; - return DXChannel->get($call); + return DXChannel::get($call); } # is it remotely connected anywhere (with exact callsign)? @@ -218,8 +229,8 @@ sub presentish_on sub last_connect { my $call = uc shift; - return $main::systime if DXChannel->get($call); - my $user = DXUser->get($call); + return $main::systime if DXChannel::get($call); + my $user = DXUser::get($call); return $user ? $user->lastin : 0; } @@ -242,31 +253,61 @@ sub start_connect 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 {} }"; - 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`; +# diffms("DXCron spawn 1", $line, $t0, scalar @res) if isdbg('chan'); + 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("by DXCron::spawn", $line, $t0, scalar @res) if isdbg('progress'); + } + ); +} - # coordinate - sleep(1); +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}; + delete $main::me->{_nospawn} 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'); + } + ); } # do an rcmd to another cluster from the crontab @@ -280,18 +321,19 @@ sub rcmd return unless $noderef && $noderef->version; # send it - DXProt::addrcmd($DXProt::me, $call, $line); + DXProt::addrcmd($main::me, $call, $line); } sub run_cmd { my $line = shift; - my @in = DXCommandmode::run_cmd($DXProt::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__