1. Added a bit more checking to the rcmd thing to make more sure that this

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 8502cbaba6b3d44bc4bd8935a566fd6c042d8ce4..b1b330b2c983f1377ed82faf0dba5397b38d9886 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -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.23";                             # the version no of the software
+$version = "1.28";                             # the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
- 
+$lockfn = "cluster.lock";       # lock file name
+      
 # handle disconnections
 sub disconnect
 {
@@ -86,6 +105,12 @@ sub rec
        # set up the basic channel info - this needs a bit more thought - there is duplication here
        if (!defined $dxchan) {
                my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
+
+                # is there one already connected to me ? 
+               if ($dxchan = DXChannel->get($call)) {
+                       disconnect($dxchan);
+                       sleep(1);
+               }
                
                # is there one already connected elsewhere in the cluster (and not a cluster)
                my $user = DXUser->get($call);
@@ -140,6 +165,9 @@ sub login
 sub cease
 {
        my $dxchan;
+
+       $SIG{'TERM'} = 'IGNORE';
+       $SIG{'INT'} = 'IGNORE';
        
        eval {
                Local::finish();   # end local processing
@@ -149,7 +177,22 @@ 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);
+       Msg->event_loop(1, 0.05);
+       Msg->event_loop(1, 0.05);
+       Msg->event_loop(1, 0.05);
+       Msg->event_loop(1, 0.05);
+       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();
+       dbg('chan', "DXSpider version $version ended");
        Log('cluster', "DXSpider V$version stopped");
+       unlink $lockfn;
        exit(0);
 }
 
@@ -170,10 +213,20 @@ sub process_inqueue
        my $data = $self->{data};
        my $dxchan = $self->{dxchan};
        my ($sort, $call, $line) = $data =~ /^(\w)(\S+)\|(.*)$/;
+
+       # the above regexp must work
+       return unless ($sort && $call && $line);
+       
+       # translate any crappy characters into hex characters 
+       if ($line =~ /[\x00-\x06\x08\x0a-\x1f\x7f-\xff]/o) {
+               $line =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
+               dbg('chan', "<- $sort $call **CRAP**: $line");
+               return;
+       }
        
        # do the really sexy console interface bit! (Who is going to do the TK interface then?)
        dbg('chan', "<- $sort $call $line\n") unless $sort eq 'D';
-       
+
        # handle A records
        my $user = $dxchan->user;
        if ($sort eq 'A' || $sort eq 'O') {
@@ -233,7 +286,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,13 +334,12 @@ eval {
 };
 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";
+dbg('chan', "DXSpider version $version started...");
 for (;;) {
        my $timenow;
        Msg->event_loop(1, 0.001);
@@ -312,5 +364,7 @@ for (;;) {
                last if --$decease <= 0;
        }
 }
+cease(0);
+exit(0);