X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCron.pm;h=8fb0f4664489609be8a6f3f56c584d6b6956d1fd;hb=4e5b3de7a26563d94678fb790b8a1e2c4daaac8d;hp=9e4bde71e9083c5b5c7e9c45a4522c98251ebb3f;hpb=f3adc82a0299652d929b73c718127fa38571eec5;p=spider.git

diff --git a/perl/DXCron.pm b/perl/DXCron.pm
index 9e4bde71..8fb0f466 100644
--- 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;
 	
@@ -184,19 +246,23 @@ sub start_connect
 		if (!$pid) {
 			# in child, unset warnings, disable debugging and general clean up from us
 			$^W = 0;
-#			do "$main::root/perl/Disable_debug.pl";
 			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 $!");
+			exec $prog, $call, 'connect' or dbg('cron', "exec '$prog' failed $!");
 		}
 		dbg('cron', "connect to $call started");
 	} else {
 		dbg('cron', "can't fork for $prog $!");
 	}
+
+	# coordinate
+	sleep(1);
 }
 
+# spawn any old job off
 sub spawn
 {
 	my $line = shift;
@@ -206,17 +272,34 @@ sub spawn
 		if (!$pid) {
 			# in child, unset warnings, disable debugging and general clean up from us
 			$^W = 0;
-#			do "$main::root/perl/Disable_debug.pl";
 			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 $!");
+			exec "$line" or dbg('cron', "exec '$line' failed $!");
 		}
 		dbg('cron', "spawn of $line started");
 	} else {
 		dbg('cron', "can't fork for $line $!");
 	}
+
+	# 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($DXProt::me, $call, $line);
 }
 1;
 __END__