added a not found message to sh/qrz

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index b96cf370b3162081628d7e355e66fe316215b1b3..995500ca934239b4ca18ec6ba580d9ef96f8e3c8 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -25,7 +25,7 @@ BEGIN {
 
        # try to create and lock a lockfile (this isn't atomic but 
        # should do for now
-       $lockfn = "$root/perl/cluster.lock";       # lock file name
+       my $lockfn = "$root/perl/cluster.lock";       # lock file name
        if (-e $lockfn) {
                open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
                my $pid = <CLLOCK>;
@@ -61,17 +61,24 @@ use Filter;
 use DXDb;
 use AnnTalk;
 use WCY;
+use DXDupe;
+use BadWords;
 
 use Data::Dumper;
 use Fcntl ':flock'; 
+use POSIX ":sys_wait_h";
 
 use Local;
 
 package main;
 
+#use strict;
+#use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects $zombies $root
+#                 $lang $myalias @debug $userfn $clusteraddr $clusterport $mycall $decease );
+
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
-$version = "1.43";                             # the version no of the software
+$version = "1.47";                             # the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 $lockfn = "cluster.lock";       # lock file name
 @outstanding_connects = ();     # list of outstanding connects
@@ -188,6 +195,8 @@ sub cease
        $SIG{'TERM'} = 'IGNORE';
        $SIG{'INT'} = 'IGNORE';
        
+       DXUser::sync;
+
        eval {
                Local::finish();   # end local processing
        };
@@ -217,6 +226,7 @@ sub cease
        Msg->event_loop(1, 0.05);
        Msg->event_loop(1, 0.05);
        DXUser::finish();
+       DXDupe::finish();
 
        # close all databases
        DXDb::closeall;
@@ -233,9 +243,13 @@ sub cease
 # the reaper of children
 sub reap
 {
-       $SIG{'CHLD'} = \&reap;
-       my $cpid = wait;
-       @outstanding_connects = grep {$_->{pid} != $cpid} @outstanding_connects;
+       my $cpid;
+       while (($cpid = waitpid(-1, WNOHANG)) > 0) {
+               dbg('reap', "cpid: $cpid");
+               @outstanding_connects = grep {$_->{pid} != $cpid} @outstanding_connects;
+               $zombies-- if $zombies > 0;
+       }
+       dbg('reap', "cpid: $cpid");
 }
 
 # this is where the input queue is dealt with and things are dispatched off to other parts of
@@ -251,11 +265,6 @@ sub process_inqueue
        my ($sort, $call, $line) = DXChannel::decode_input($dxchan, $data);
        return unless defined $sort;
        
-       # 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;
-       }
-
        # 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';
 
@@ -295,6 +304,7 @@ sub uptime
 #############################################################
 
 $starttime = $systime = time;
+$lang = 'en' unless $lang;
 
 # open the debug file, set various FHs to be unbuffered
 dbginit();
@@ -306,7 +316,7 @@ STDOUT->autoflush(1);
 Log('cluster', "DXSpider V$version started");
 
 # banner
-dbg('err', "DXSpider DX Cluster Version $version", "Copyright (c) 1998-2000 Dirk Koopman G1TLH");
+dbg('err', "DXSpider DX Cluster Version $version", "Copyright (c) 1998-2001 Dirk Koopman G1TLH");
 
 # load Prefixes
 dbg('err', "loading prefixes ...");
@@ -324,11 +334,32 @@ DXUser->init($userfn, 1);
 dbg('err', "starting listener ...");
 Msg->new_server("$clusteraddr", $clusterport, \&login);
 
+# load bad words
+dbg('err', "load badwords: " . (BadWords::load or "Ok"));
+
 # prime some signals
-$SIG{'INT'} = \&cease;
-$SIG{'TERM'} = \&cease;
-$SIG{'HUP'} = 'IGNORE';
-$SIG{'CHLD'} = \&reap;
+unless ($^O =~ /^MS/) {
+       $SIG{INT} = \&cease;
+       $SIG{TERM} = \&cease;
+       $SIG{HUP} = 'IGNORE';
+       $SIG{CHLD} = sub { $zombies++ };
+       
+       $SIG{PIPE} = sub {      dbg('err', "Broken PIPE signal received"); };
+       $SIG{IO} = sub {        dbg('err', "SIGIO received"); };
+       $SIG{WINCH} = $SIG{STOP} = $SIG{CONT} = 'IGNORE';
+       $SIG{KILL} = 'DEFAULT';     # as if it matters....
+
+       # catch the rest with a hopeful message
+       for (keys %SIG) {
+               if (!$SIG{$_}) {
+                       #               dbg('chan', "Catching SIG $_");
+                       $SIG{$_} = sub { my $sig = shift;       DXDebug::confess("Caught signal $sig");  }; 
+               }
+       }
+}
+
+# start dupe system
+DXDupe::init();
 
 # read in system messages
 DXM->init();
@@ -347,9 +378,8 @@ Spot->init();
 dbg('err', "reading in duplicate spot and WWV info ...");
 DXProt->init();
 
-
 # put in a DXCluster node for us here so we can add users and take them away
-DXNode->new(0, $mycall, 0, 1, $DXProt::myprot_version); 
+DXNode->new($DXProt::me, $mycall, 0, 1, $DXProt::myprot_version); 
 
 # read in any existing message headers and clean out old crap
 dbg('err', "reading existing message headers ...");
@@ -379,31 +409,27 @@ dbg('err', "orft we jolly well go ...");
 
 #open(DB::OUT, "|tee /tmp/aa");
 
-$SIG{PIPE} = sub { 
-       #$DB::single = 1;  
-       dbg('err', "Broken PIPE signal received"); 
-};
-
 for (;;) {
-       my $timenow;
 #      $DB::trace = 1;
        
        Msg->event_loop(1, 0.1);
-       $timenow = time;
+       my $timenow = time;
        process_inqueue();                      # read in lines from the input queue and despatch them
 #      $DB::trace = 0;
        
        # do timed stuff, ongoing processing happens one a second
        if ($timenow != $systime) {
+               reap if $zombies;
                $systime = $timenow;
-               $cldate = &cldate();
-               $ztime = &ztime();
                DXCron::process();      # do cron jobs
                DXCommandmode::process(); # process ongoing command mode stuff
                DXProt::process();              # process ongoing ak1a pcxx stuff
                DXConnect::process();
                DXMsg::process();
                DXDb::process();
+               DXUser::process();
+               DXDupe::process();
+               
                eval { 
                        Local::process();       # do any localised processing
                };