5. Only wonder down the msg queue every minute

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 308b1d90b987104618df84182a10399b6f94ea38..8b45e2bd65d805d7fc411650b387a586199d103f 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -59,6 +59,7 @@ use Geomag;
 use CmdAlias;
 use Filter;
 use Local;
+use DXDb;
 use Fcntl ':flock'; 
 
 use Carp qw(cluck);
@@ -177,6 +178,9 @@ sub cease
        };
        dbg('local', "Local::finish error $@") if $@;
 
+       # close all databases
+       DXDb::closeall;
+       
        # disconnect users
        foreach $dxchan (DXChannel->get_all()) {
                next if $dxchan->is_ak1a;
@@ -241,9 +245,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,13 +256,8 @@ 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') {
                disconnect($dxchan);
@@ -353,6 +349,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 +382,7 @@ for (;;) {
                DXProt::process();              # process ongoing ak1a pcxx stuff
                DXConnect::process();
                DXMsg::process();
+               DXDb::process();
                eval { 
                        Local::process();       # do any localised processing
                };