*** empty log message ***

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index fa793f22365ebd6dc66fd8044026d81e57088f68..4a4400a15f45c90fae90a76d36cd0fd515905efa 100755 (executable)
--- 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,7 +57,9 @@ use Prefix;
 use Bands;
 use Geomag;
 use CmdAlias;
+use Filter;
 use Local;
+use Fcntl ':flock'; 
 
 use Carp;
 
@@ -52,9 +67,10 @@ package main;
 
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
-$version = "1.17";                             # 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
 {
@@ -143,6 +159,9 @@ sub login
 sub cease
 {
        my $dxchan;
+
+       $SIG{'TERM'} = 'IGNORE';
+       $SIG{'INT'} = 'IGNORE';
        
        eval {
                Local::finish();   # end local processing
@@ -152,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);
 }
 
@@ -236,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";
@@ -278,14 +303,12 @@ print "reading cron jobs ...\n";
 DXCron->init();
 
 # starting local stuff
-print "doing local initialisation ...\n"
+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";
 
@@ -315,5 +338,7 @@ for (;;) {
                last if --$decease <= 0;
        }
 }
+cease(0);
+exit(0);