X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=2330bcda5639f5ae02986ce7119d206b5f1990b5;hb=1728c7c7a64eaf2852c490629f022c7e70bc46e2;hp=32f90d88ded118a462f2b75bc247352d3d23c726;hpb=97d5445b1e468d9228367640421b2f90ac021224;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 32f90d88..2330bcda 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 #
 # This is the DX cluster 'daemon'. It sits in the middle of its little
 # web of client routines sucking and blowing data where it may.
@@ -14,6 +14,8 @@ require 5.004;
 
 # make sure that modules are searched in the order local then perl
 BEGIN {
+	umask 002;
+	
 	# root of directory tree for this system
 	$root = "/spider"; 
 	$root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
@@ -21,8 +23,19 @@ BEGIN {
 	unshift @INC, "$root/perl";	# this IS the right way round!
 	unshift @INC, "$root/local";
 
-#	require Exporter;
-#	$Exporter::Verbose = 1;
+	# try to create and lock a lockfile (this isn't atomic but 
+	# should do for now
+	$lockfn = "$root/perl/cluster.lock";       # lock file name
+	if (-e $lockfn) {
+		open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
+		my $pid = <CLLOCK>;
+		chomp $pid;
+		die "Lockfile ($lockfn) and process $pid exist, another cluster running?" if kill 0, $pid;
+		close CLLOCK;
+	}
+	open(CLLOCK, ">$lockfn") or die "Can't open Lockfile ($lockfn) $!";
+	print CLLOCK "$$\n";
+	close CLLOCK;
 }
 
 use Msg;
@@ -44,15 +57,20 @@ use Prefix;
 use Bands;
 use Geomag;
 use CmdAlias;
+use Filter;
+use Local;
+use Fcntl ':flock'; 
+
 use Carp;
 
 package main;
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.13";				# the version no of the software
+$version = "1.24";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
- 
+$lockfn = "cluster.lock";       # lock file name
+      
 # handle disconnections
 sub disconnect
 {
@@ -91,7 +109,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,16 +159,29 @@ 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;
 	}
+	Msg->event_loop(1, 0.05);
+	Msg->event_loop(1, 0.05);
+	Msg->event_loop(1, 0.05);
+	Msg->event_loop(1, 0.05);
 	Log('cluster', "DXSpider V$version stopped");
+	DXUser::finish();
+	unlink $lockfn;
 	exit(0);
 }
 
 # the reaper of children
 sub reap
 {
+	$SIG{'CHLD'} = \&reap;
 	my $cpid = wait;
 }
 
@@ -227,7 +258,7 @@ Bands::load();
 
 # initialise User file system
 print "loading user file system ...\n"; 
-DXUser->init($userfn);
+DXUser->init($userfn, 1);
 
 # start listening for incoming messages/connects
 print "starting listener ...\n";
@@ -245,27 +276,39 @@ DXM->init();
 # read in command aliases
 CmdAlias->init();
 
-# initialise the protocol engine
-DXProt->init();
-
 # initialise the Geomagnetic data engine
 Geomag->init();
 
 # initial the Spot stuff
 Spot->init();
 
+# initialise the protocol engine
+print "reading in duplicate spot and WWV info ...\n";
+DXProt->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 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 (;;) {
@@ -283,6 +326,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;