X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=8e88884214b0b3b239d003d31f2982cbb7b14265;hb=8a0f0fc3c54895f0ce8b0207e42af1f693d757f6;hp=4c65e86858acb7c7711152562579c06d0384276f;hpb=50bafbfa099ff0847beeb30e41bc62a361ef0536;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 4c65e868..8e888842 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -47,7 +47,7 @@ package main;
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = 1.3;					# the version no of the software
+$version = 1.5;					# the version no of the software
 
 # handle disconnections
 sub disconnect
@@ -129,9 +129,16 @@ sub cease
 	foreach $dxchan (DXChannel->get_all()) {
 		disconnect($dxchan);
 	}
+	Log('cluster', "DXSpider V$version stopped");
 	exit(0);
 }
 
+# the reaper of children
+sub reap
+{
+	my $cpid = wait;
+}
+
 # this is where the input queue is dealt with and things are dispatched off to other parts of
 # the cluster
 sub process_inqueue
@@ -141,15 +148,15 @@ sub process_inqueue
 	
 	my $data = $self->{data};
 	my $dxchan = $self->{dxchan};
-	my ($sort, $call, $line) = $data =~ /^(\w)(\S+)\|(.*)$/;
+	my ($sort, $call, $line) = $data =~ /^(\w)(\w+)\|(.*)$/;
 	
 	# do the really sexy console interface bit! (Who is going to do the TK interface then?)
 	dbg('chan', "<- $sort $call $line\n");
 	
 	# handle A records
 	my $user = $dxchan->user;
-	if ($sort eq 'A') {
-		$dxchan->start($line);  
+	if ($sort eq 'A' || $sort eq 'O') {
+		$dxchan->start($line, $sort);  
 	} elsif ($sort eq 'D') {
 		die "\$user not defined for $call" if !defined $user;
 		
@@ -170,12 +177,16 @@ sub process_inqueue
 #
 #############################################################
 
+$systime = time;
+
 # open the debug file, set various FHs to be unbuffered
 foreach (@debug) {
 	dbgadd($_);
 }
 STDOUT->autoflush(1);
 
+Log('cluster', "DXSpider V$version started");
+
 # banner
 print "DXSpider DX Cluster Version $version\nCopyright (c) 1998 Dirk Koopman G1TLH\n";
 
@@ -199,6 +210,7 @@ Msg->new_server("$clusteraddr", $clusterport, \&login);
 $SIG{'INT'} = \&cease;
 $SIG{'TERM'} = \&cease;
 $SIG{'HUP'} = 'IGNORE';
+$SIG{'CHLD'} = \&reap;
 
 # read in system messages
 DXM->init();
@@ -218,9 +230,10 @@ Spot->init();
 # put in a DXCluster node for us here so we can add users and take them away
 DXNode->new(0, $mycall, 0, 1, $DXProt::myprot_version); 
 
-# read in any existing message headers
+# read in any existing message headers and clean out old crap
 print "reading existing message headers\n";
 DXMsg->init();
+DXMsg::clean_old();
 
 # read in any cron jobs
 print "reading cron jobs\n";
@@ -244,6 +257,9 @@ for (;;) {
 		DXProt::process();		# process ongoing ak1a pcxx stuff
 		DXConnect::process();
 	}
+	if ($decease) {
+		last if --$decease <= 0;
+	}
 }