use CmdAlias;
use Filter;
use Local;
+use DXDb;
+use Data::Dumper;
+
use Fcntl ':flock';
use Carp qw(cluck);
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
-$version = "1.31"; # 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
# 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;
}
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();
{
$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
# 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?)
$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);
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 {
dbg('chan', "DXSpider version $version started...");
for (;;) {
my $timenow;
- Msg->event_loop(1, 0.001);
+ Msg->event_loop(1, 0.1);
$timenow = time;
process_inqueue(); # read in lines from the input queue and despatch them
DXProt::process(); # process ongoing ak1a pcxx stuff
DXConnect::process();
DXMsg::process();
+ DXDb::process();
eval {
Local::process(); # do any localised processing
};