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

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 8dc14ed8..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,12 +14,28 @@ 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'};
 	
 	unshift @INC, "$root/perl";	# this IS the right way round!
 	unshift @INC, "$root/local";
+
+	# 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;
@@ -41,7 +57,9 @@ use Prefix;
 use Bands;
 use Geomag;
 use CmdAlias;
+use Filter;
 use Local;
+use Fcntl ':flock'; 
 
 use Carp;
 
@@ -49,9 +67,10 @@ package main;
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.21";				# 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
 {
@@ -140,6 +159,9 @@ sub login
 sub cease
 {
 	my $dxchan;
+
+	$SIG{'TERM'} = 'IGNORE';
+	$SIG{'INT'} = 'IGNORE';
 	
 	eval {
 		Local::finish();   # end local processing
@@ -149,7 +171,13 @@ sub cease
 	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);
 }
 
@@ -233,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";
@@ -281,8 +309,6 @@ eval {
 };
 dbg('local', "Local::init error $@") if $@;
 
-
-
 # print various flags
 #print "useful info - \$^D: $^D \$^W: $^W \$^S: $^S \$^P: $^P\n";
 
@@ -312,5 +338,7 @@ for (;;) {
 		last if --$decease <= 0;
 	}
 }
+cease(0);
+exit(0);