X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=88131b21a6931b08583b7cf0df5e760c5d4024ee;hb=4ed8f51684c6f2183ffd5e46f1fc69dc4f52ebd9;hp=1c1ba3c8581cac29b4b82d3ccb7e299a960231dd;hpb=15424b325766c68bc04207c71dbaf86f06ca5ffa;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 1c1ba3c8..88131b21 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -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'};
@@ -55,6 +57,7 @@ use Prefix;
 use Bands;
 use Geomag;
 use CmdAlias;
+use Filter;
 use Local;
 use Fcntl ':flock'; 
 
@@ -64,7 +67,7 @@ package main;
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.24";				# the version no of the software
+$version = "1.26";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 $lockfn = "cluster.lock";       # lock file name
       
@@ -156,6 +159,9 @@ sub login
 sub cease
 {
 	my $dxchan;
+
+	$SIG{'TERM'} = 'IGNORE';
+	$SIG{'INT'} = 'IGNORE';
 	
 	eval {
 		Local::finish();   # end local processing
@@ -169,6 +175,7 @@ sub cease
 	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);
@@ -254,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";
@@ -331,5 +338,7 @@ for (;;) {
 		last if --$decease <= 0;
 	}
 }
+cease(0);
+exit(0);