X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCron.pm;h=70c8e6606515015731646ccc4a3e6490cb51c0ef;hb=ab811a0c902225075a9bd69749f65594079433a9;hp=3c9c04fb8bb015a7fb37a5c2cc541c55832fdfc5;hpb=5d197c9f7aa2ea796d86aa5473f93956b24cf1b7;p=spider.git diff --git a/perl/DXCron.pm b/perl/DXCron.pm index 3c9c04fb..70c8e660 100644 --- a/perl/DXCron.pm +++ b/perl/DXCron.pm @@ -3,7 +3,7 @@ # # Copyright (c) 1998 - Dirk Koopman G1TLH # -# $Id$ +# # package DXCron; @@ -12,15 +12,13 @@ use DXVars; use DXUtil; use DXM; use DXDebug; -use FileHandle; -use Carp; +use IO::File; use strict; -use vars qw{@crontab $mtime $lasttime $lastmin}; +use vars qw{@crontab @lcrontab @scrontab $mtime $lasttime $lastmin}; -@crontab = (); -$mtime = 1; +$mtime = 0; $lasttime = 0; $lastmin = 0; @@ -34,23 +32,22 @@ sub init if ((-e $localfn && -M $localfn < $mtime) || (-e $fn && -M $fn < $mtime) || $mtime == 0) { my $t; - @crontab = (); - # first read in the standard one if (-e $fn) { $t = -M $fn; - cread($fn); - $mtime = $t if $t <= $mtime; + @scrontab = cread($fn); + $mtime = $t if !$mtime || $t <= $mtime; } # then read in any local ones if (-e $localfn) { $t = -M $localfn; - cread($localfn); + @lcrontab = cread($localfn); $mtime = $t if $t <= $mtime; } + @crontab = (@scrontab, @lcrontab); } } @@ -58,17 +55,18 @@ sub init sub cread { my $fn = shift; - my $fh = new FileHandle; + my $fh = new IO::File; my $line = 0; + my @out; - dbg('cron', "cron: reading $fn\n"); + dbg("cron: reading $fn\n") if isdbg('cron'); open($fh, $fn) or confess("cron: can't open $fn $!"); while (<$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; - next if !$min; + next unless defined $min; my $ref = bless {}; my $err; @@ -79,13 +77,14 @@ sub cread $err |= parse($ref, 'wday', $wday, 0, 6, "sun", "mon", "tue", "wed", "thu", "fri", "sat"); if (!$err) { $ref->{cmd} = $cmd; - push @crontab, $ref; - dbg('cron', "cron: adding $_\n"); + push @out, $ref; + dbg("cron: adding $_\n") if isdbg('cron'); } else { - dbg('cron', "cron: error on line $line '$_'\n"); + dbg("cron: error on line $line '$_'\n") if isdbg('cron'); } } close($fh); + return @out; } sub parse @@ -148,9 +147,9 @@ sub process (!$cron->{wday} || grep $_ eq $wday, @{$cron->{wday}}) ){ if ($cron->{cmd}) { - dbg('cron', "cron: $min $hour $mday $mon $wday -> doing '$cron->{cmd}'"); + dbg("cron: $min $hour $mday $mon $wday -> doing '$cron->{cmd}'") if isdbg('cron'); eval "$cron->{cmd}"; - dbg('cron', "cron: cmd error $@") if $@; + dbg("cron: cmd error $@") if $@ && isdbg('cron'); } } } @@ -165,42 +164,81 @@ sub process # these are simple stub functions to make connecting easy in DXCron contexts # +# is it locally connected? sub connected { my $call = uc shift; - return DXChannel->get($call); + return DXChannel::get($call); } -sub start_connect +# is it remotely connected anywhere (with exact callsign)? +sub present { my $call = uc shift; - my $lccall = lc $call; + return Route::get($call); +} - my $prog = "$main::root/local/client.pl"; - $prog = "$main::root/perl/client.pl" if ! -e $prog; - - 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 {} }"; - $SIG{HUP} = 'IGNORE'; - alarm(0); - DXChannel::closeall(); - $SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT'; - exec $prog, $call, 'connect'; - dbg('cron', "exec '$prog' failed $!"); +# is it remotely connected anywhere (ignoring SSIDS)? +sub presentish +{ + my $call = uc shift; + my $c = Route::get($call); + unless ($c) { + for (1..15) { + $c = Route::get("$call-$_"); + last if $c; } - dbg('cron', "connect to $call started"); - } else { - dbg('cron', "can't fork for $prog $!"); } + return $c; +} - # coordinate - sleep(1); +# is it remotely connected anywhere (with exact callsign) and on node? +sub present_on +{ + my $call = uc shift; + my $ncall = uc shift; + my $node = Route::Node::get($ncall); + return ($node) ? grep $call eq $_, $node->users : undef; +} + +# is it remotely connected (ignoring SSIDS) and on node? +sub presentish_on +{ + my $call = uc shift; + my $ncall = uc shift; + my $node = Route::Node::get($ncall); + my $present; + if ($node) { + $present = grep {/^$call/ } $node->users; + } + return $present; } +# last time this thing was connected +sub last_connect +{ + my $call = uc shift; + return $main::systime if DXChannel::get($call); + my $user = DXUser::get($call); + return $user ? $user->lastin : 0; +} + +# disconnect a locally connected thing +sub disconnect +{ + my $call = shift; + run_cmd("disconnect $call"); +} + +# start a connect process off +sub start_connect +{ + my $call = shift; + # connecting is now done in one place - Yeah! + run_cmd("connect $call"); +} + +# spawn any old job off sub spawn { my $line = shift; @@ -211,20 +249,49 @@ sub spawn # in child, unset warnings, disable debugging and general clean up from us $^W = 0; eval "{ package DB; sub DB {} }"; - $SIG{HUP} = 'IGNORE'; - alarm(0); DXChannel::closeall(); - $SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT'; - exec "$line"; - dbg('cron', "exec '$line' failed $!"); + 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('cron', "spawn of $line started"); + dbg("spawn of $line started") if isdbg('cron'); } else { - dbg('cron', "can't fork for $line $!"); + dbg("can't fork for $line $!") if isdbg('cron'); } # coordinate sleep(1); } + +# do an rcmd to another cluster from the crontab +sub rcmd +{ + my $call = uc shift; + my $line = shift; + + # can we see it? Is it a node? + my $noderef = Route::Node::get($call); + return unless $noderef && $noderef->version; + + # send it + DXProt::addrcmd($main::me, $call, $line); +} + +sub run_cmd +{ + my $line = shift; + my @in = DXCommandmode::run_cmd($main::me, $line); + dbg("cmd run: $line") if isdbg('cron'); + for (@in) { + s/\s*$//og; + dbg("cmd out: $_") if isdbg('cron'); + } +} 1; __END__