added loginfo stuff

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 308b1d90b987104618df84182a10399b6f94ea38..64cbab11ed1d6efc69ed2adc3f6896eb85ca8dee 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -59,6 +59,9 @@ use Geomag;
 use CmdAlias;
 use Filter;
 use Local;
+use DXDb;
+use Data::Dumper;
+
 use Fcntl ':flock'; 
 
 use Carp qw(cluck);
@@ -67,9 +70,10 @@ package main;
 
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
-$version = "1.34";                             # the version no of the software
+$version = "1.35";                             # 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
       
 # handle disconnections
 sub disconnect
@@ -100,7 +104,9 @@ sub rec
        my $dxchan = DXChannel->get_by_cnum($conn); # get the dxconnnect object for this message
        
        if (defined $err && $err) {
-               disconnect($dxchan) if defined $dxchan;
+               if ($dxchan) {
+                       disconnect($dxchan);
+               }
                return;
        }
        
@@ -147,6 +153,7 @@ sub rec
                # create the channel
                $dxchan = DXCommandmode->new($call, $conn, $user) if ($user->sort eq 'U');
                $dxchan = DXProt->new($call, $conn, $user) if ($user->sort eq 'A');
+               $dxchan = BBS->new($call, $conn, $user) if ($user->sort eq 'B');
                die "Invalid sort of user on $call = $sort" if !$dxchan;
        }
        
@@ -207,6 +214,10 @@ sub cease
        Msg->event_loop(1, 0.05);
        Msg->event_loop(1, 0.05);
        DXUser::finish();
+
+       # close all databases
+       DXDb::closeall;
+       
        dbg('chan', "DXSpider version $version ended");
        Log('cluster', "DXSpider V$version stopped");
        dbgclose();
@@ -221,6 +232,7 @@ sub reap
 {
        $SIG{'CHLD'} = \&reap;
        my $cpid = wait;
+       @outstanding_connects = grep {$_->{pid} != $cpid} @outstanding_connects;
 }
 
 # this is where the input queue is dealt with and things are dispatched off to other parts of
@@ -241,9 +253,6 @@ sub process_inqueue
        # 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;
-               ++$error;
-#              dbg('chan', "<- $sort $call **CRAP**: $line");
-#              return;
        }
        
        # do the really sexy console interface bit! (Who is going to do the TK interface then?)
@@ -255,15 +264,11 @@ sub process_inqueue
                $dxchan->start($line, $sort);  
        } elsif ($sort eq 'I') {
                die "\$user not defined for $call" if !defined $user;
-
-               if ($error) {
-                       dbg('chan', "DROPPED with $error duff characters");
-               } else {
-                       # normal input
-                       $dxchan->normal($line);
-               }
+               # normal input
+               $dxchan->normal($line);
                disconnect($dxchan) if ($dxchan->{state} eq 'bye');
        } elsif ($sort eq 'Z') {
+               $dxchan->conn(undef);
                disconnect($dxchan);
        } elsif ($sort eq 'D') {
                ;                       # ignored (an echo)
@@ -300,7 +305,7 @@ STDOUT->autoflush(1);
 Log('cluster', "DXSpider V$version started");
 
 # banner
-print "DXSpider DX Cluster Version $version\nCopyright (c) 1998 Dirk Koopman G1TLH\n";
+print "DXSpider DX Cluster Version $version\nCopyright (c) 1998-1999 Dirk Koopman G1TLH\n";
 
 # load Prefixes
 print "loading prefixes ...\n";
@@ -353,6 +358,10 @@ DXMsg::clean_old();
 print "reading cron jobs ...\n";
 DXCron->init();
 
+# read in database descriptors
+print "reading database descriptors ...\n";
+DXDb::load();
+
 # starting local stuff
 print "doing local initialisation ...\n";
 eval {
@@ -382,6 +391,7 @@ for (;;) {
                DXProt::process();              # process ongoing ak1a pcxx stuff
                DXConnect::process();
                DXMsg::process();
+               DXDb::process();
                eval { 
                        Local::process();       # do any localised processing
                };