get all the debugging finally into the debug files when things go wrong

[spider.git] / perl / DXCron.pm

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 3c9c04fb8bb015a7fb37a5c2cc541c55832fdfc5..eefa25816cac8181432d2edc9c5a3343d5ab40dd 100644 (file)
--- a/perl/DXCron.pm
+++ b/perl/DXCron.pm
@@ -12,15 +12,14 @@ use DXVars;
 use DXUtil;
 use DXM;
 use DXDebug;
-use FileHandle;
-use Carp;
+use IO::File;
 
 use strict;
 
 use vars qw{@crontab $mtime $lasttime $lastmin};
 
 @crontab = ();
-$mtime = 1;
+$mtime = 0;
 $lasttime = 0;
 $lastmin = 0;
 
@@ -41,7 +40,7 @@ sub init
                        $t = -M $fn;
                        
                        cread($fn);
-                       $mtime = $t if  $t <= $mtime;
+                       $mtime = $t if  !$mtime || $t <= $mtime;
                }
 
                # then read in any local ones
@@ -58,7 +57,7 @@ sub init
 sub cread
 {
        my $fn = shift;
-       my $fh = new FileHandle;
+       my $fh = new IO::File;
        my $line = 0;
 
        dbg('cron', "cron: reading $fn\n");
@@ -165,17 +164,80 @@ 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);
 }
 
+# is it remotely connected anywhere (with exact callsign)?
+sub present
+{
+       my $call = uc shift;
+       return DXCluster->get_exact($call);
+}
+
+# is it remotely connected anywhere (ignoring SSIDS)?
+sub presentish
+{
+       my $call = uc shift;
+       return DXCluster->get($call);
+}
+
+# is it remotely connected anywhere (with exact callsign) and on node?
+sub present_on
+{
+       my $call = uc shift;
+       my $node = uc shift;
+       my $ref = DXCluster->get_exact($call);
+       return ($ref && $ref->mynode) ? $ref->mynode->call eq $node : undef;
+}
+
+# is it remotely connected anywhere (ignoring SSIDS) and on node?
+sub presentish_on
+{
+       my $call = uc shift;
+       my $node = uc shift;
+       my $ref = DXCluster->get($call);
+       return ($ref && $ref->mynode) ? $ref->mynode->call eq $node : undef;
+}
+
+# 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 = uc shift;
+       my $dxchan = DXChannel->get($call);
+       if ($dxchan) {
+               if ($dxchan->is_ak1a) {
+                       $dxchan->send_now("D", DXProt::pc39($main::mycall, "$main::mycall DXCron"));
+               } else {
+                       $dxchan->send_now('D', "");
+               } 
+               $dxchan->disconnect;
+       }
+}
+
+# start a connect process off
 sub start_connect
 {
        my $call = uc shift;
        my $lccall = lc $call;
 
+       if (grep {$_->{call} eq $call} @main::outstanding_connects) {
+               dbg('cron', "Connect not started, outstanding connect to $call");
+               return;
+       }
+       
        my $prog = "$main::root/local/client.pl";
        $prog = "$main::root/perl/client.pl" if ! -e $prog;
        
@@ -189,8 +251,7 @@ sub start_connect
                        alarm(0);
                        DXChannel::closeall();
                        $SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT';
-                       exec $prog, $call, 'connect';
-                       dbg('cron', "exec '$prog' failed $!");
+                       exec $prog, $call, 'connect' or dbg('cron', "exec '$prog' failed $!");
                }
                dbg('cron', "connect to $call started");
        } else {
@@ -201,6 +262,7 @@ sub start_connect
        sleep(1);
 }
 
+# spawn any old job off
 sub spawn
 {
        my $line = shift;
@@ -215,8 +277,7 @@ sub spawn
                        alarm(0);
                        DXChannel::closeall();
                        $SIG{CHLD} = $SIG{TERM} = $SIG{INT} = $SIG{__WARN__} = 'DEFAULT';
-                       exec "$line";
-                       dbg('cron', "exec '$line' failed $!");
+                       exec "$line" or dbg('cron', "exec '$line' failed $!");
                }
                dbg('cron', "spawn of $line started");
        } else {
@@ -226,5 +287,19 @@ sub spawn
        # 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 = DXCluster->get_exact($call);
+       return  if !$noderef || !$noderef->pcversion;
+
+       # send it 
+       DXProt::addrcmd($main::mycall, $call, $line);
+}
 1;
 __END__