X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=4a4400a15f45c90fae90a76d36cd0fd515905efa;hb=ca18864d1264fadfe9869b630f05c950876c2169;hp=f0fced78adf0bfc93e47416421c83cb3f50866b8;hpb=5f1ef9f393b44a1e4b29b290332c386cfadcb5de;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index f0fced78..4a4400a1 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.15";				# the version no of the software
+$version = "1.25";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
- 
+$lockfn = "cluster.lock";       # lock file name
+      
 # handle disconnections
 sub disconnect
 {
@@ -141,16 +159,32 @@ sub login
 sub cease
 {
 	my $dxchan;
+
+	$SIG{'TERM'} = 'IGNORE';
+	$SIG{'INT'} = 'IGNORE';
+	
+	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);
+	DXUser::finish();
 	Log('cluster', "DXSpider V$version stopped");
+	unlink $lockfn;
 	exit(0);
 }
 
 # the reaper of children
 sub reap
 {
+	$SIG{'CHLD'} = \&reap;
 	my $cpid = wait;
 }
 
@@ -227,7 +261,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";
@@ -260,14 +294,24 @@ 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,10 +329,16 @@ 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;
 	}
 }
+cease(0);
+exit(0);