X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=30f815418acdc00d3d640ac3aa2ee3050985483a;hb=d16a47c69c71370281d87c975bc6089d976eaa7b;hp=26f3b97ab223addda6a7b161b66cae2d63d9cc83;hpb=d5b4190c36f130852973121042876af3c5642cd7;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 26f3b97a..30f81541 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -20,9 +20,6 @@ BEGIN {
 	
 	unshift @INC, "$root/perl";	# this IS the right way round!
 	unshift @INC, "$root/local";
-
-#	require Exporter;
-#	$Exporter::Verbose = 1;
 }
 
 use Msg;
@@ -44,13 +41,15 @@ use Prefix;
 use Bands;
 use Geomag;
 use CmdAlias;
+use Local;
+
 use Carp;
 
 package main;
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.14";				# the version no of the software
+$version = "1.22";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
  
 # handle disconnections
@@ -91,7 +90,7 @@ sub rec
 		# is there one already connected elsewhere in the cluster (and not a cluster)
 		my $user = DXUser->get($call);
 		if ($user) {
-			if (($user->sort eq 'A' || $call == $myalias) && !DXCluster->get_exact($call)) {
+			if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
 				;
 			} else {
 				if (DXCluster->get($call) || DXChannel->get($call)) {
@@ -141,6 +140,12 @@ sub login
 sub cease
 {
 	my $dxchan;
+	
+	eval {
+		Local::finish();   # end local processing
+	};
+	dbg('local', "Local::finish error $@") if $@;
+	
 	foreach $dxchan (DXChannel->get_all()) {
 		disconnect($dxchan) unless $dxchan == $DXProt::me;
 	}
@@ -151,6 +156,7 @@ sub cease
 # the reaper of children
 sub reap
 {
+	$SIG{'CHLD'} = \&reap;
 	my $cpid = wait;
 }
 
@@ -260,14 +266,26 @@ DXProt->init();
 DXNode->new(0, $mycall, 0, 1, $DXProt::myprot_version); 
 
 # read in any existing message headers and clean out old crap
-print "reading existing message headers\n";
+print "reading existing message headers ...\n";
 DXMsg->init();
 DXMsg::clean_old();
 
 # read in any cron jobs
-print "reading cron jobs\n";
+print "reading cron jobs ...\n";
 DXCron->init();
 
+# starting local stuff
+print "doing local initialisation ...\n";
+eval {
+	Local::init();
+};
+dbg('local', "Local::init error $@") if $@;
+
+
+
+# print various flags
+#print "useful info - \$^D: $^D \$^W: $^W \$^S: $^S \$^P: $^P\n";
+
 # this, such as it is, is the main loop!
 print "orft we jolly well go ...\n";
 for (;;) {
@@ -285,6 +303,10 @@ for (;;) {
 		DXCommandmode::process(); # process ongoing command mode stuff
 		DXProt::process();		# process ongoing ak1a pcxx stuff
 		DXConnect::process();
+		eval { 
+			Local::process();       # do any localised processing
+		};
+		dbg('local', "Local::process error $@") if $@;
 	}
 	if ($decease) {
 		last if --$decease <= 0;