added chaining to databases

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index ceb099ca7eb4f6b64977447e6a800d7c5be0c1e6..1f011c55584971360363523d3c332d3e8c6f5766 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);
@@ -67,7 +68,7 @@ package main;
 
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
-$version = "1.33";                             # the version no of the software
+$version = "1.34";                             # the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 $lockfn = "cluster.lock";       # lock file name
       
@@ -207,6 +208,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();
@@ -241,9 +246,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 +257,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 +350,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 +383,7 @@ for (;;) {
                DXProt::process();              # process ongoing ak1a pcxx stuff
                DXConnect::process();
                DXMsg::process();
+               DXDb::process();
                eval { 
                        Local::process();       # do any localised processing
                };