projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get the bloody thing right!
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index 51e8aed7b386cd9ced159f7ac8d1408e9bb6c019..4f88ef02d0ee3925206311ec2c355f400811e5c2 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-59,6
+59,9
@@
use Geomag;
use CmdAlias;
use Filter;
use Local;
use CmdAlias;
use Filter;
use Local;
+use DXDb;
+use Data::Dumper;
+
use Fcntl ':flock';
use Carp qw(cluck);
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)
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
-$version = "1.3
1
"; # the version no of the software
+$version = "1.3
8
"; # the version no of the software
$starttime = 0; # the starting time of the cluster
$lockfn = "cluster.lock"; # lock file name
$starttime = 0; # the starting time of the cluster
$lockfn = "cluster.lock"; # lock file name
+@outstanding_connects = (); # list of outstanding connects
# handle disconnections
sub disconnect
# handle disconnections
sub disconnect
@@
-89,6
+93,8
@@
sub already_conn
sleep(1);
dbg('chan', "-> Z $call bye\n");
$conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
sleep(1);
dbg('chan', "-> Z $call bye\n");
$conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
+ sleep(1);
+ $conn->disconnect();
}
# handle incoming messages
}
# handle incoming messages
@@
-98,28
+104,30
@@
sub rec
my $dxchan = DXChannel->get_by_cnum($conn); # get the dxconnnect object for this message
if (defined $err && $err) {
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) {
+ $dxchan->disconnect;
+ }
return;
}
# set up the basic channel info - this needs a bit more thought - there is duplication here
if (!defined $dxchan) {
my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
return;
}
# set up the basic channel info - this needs a bit more thought - there is duplication here
if (!defined $dxchan) {
my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
-
-
# is there one already connected to me
?
+
+
# is there one already connected to me - locally
?
my $user = DXUser->get($call);
if (DXChannel->get($call)) {
my $user = DXUser->get($call);
if (DXChannel->get($call)) {
- my $mess = DXM::msg($lang,
$user->sort eq 'A'
? 'concluster' : 'conother', $call);
+ my $mess = DXM::msg($lang,
($user && $user->sort eq 'A')
? 'concluster' : 'conother', $call);
already_conn($conn, $call, $mess);
return;
}
already_conn($conn, $call, $mess);
return;
}
- # is there one already connected elsewhere in the cluster
(and not a cluster)
+ # is there one already connected elsewhere in the cluster
?
if ($user) {
if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
;
} else {
if ($user) {
if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
;
} else {
- if (DXCluster->get
($call) || DXChannel->ge
t($call)) {
+ if (DXCluster->get
_exac
t($call)) {
my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
already_conn($conn, $call, $mess);
return;
my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
already_conn($conn, $call, $mess);
return;
@@
-127,7
+135,7
@@
sub rec
}
$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
} else {
}
$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
} else {
- if (DXCluster->get($call)) {
+ if (DXCluster->get
_exact
($call)) {
my $mess = DXM::msg($lang, 'conother', $call);
already_conn($conn, $call, $mess);
return;
my $mess = DXM::msg($lang, 'conother', $call);
already_conn($conn, $call, $mess);
return;
@@
-145,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');
# 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;
}
die "Invalid sort of user on $call = $sort" if !$dxchan;
}
@@
-175,9
+184,9
@@
sub cease
};
dbg('local', "Local::finish error $@") if $@;
};
dbg('local', "Local::finish error $@") if $@;
- # disconnect
user
s
+ # disconnect
node
s
foreach $dxchan (DXChannel->get_all()) {
foreach $dxchan (DXChannel->get_all()) {
- next
if
$dxchan->is_ak1a;
+ next
unless
$dxchan->is_ak1a;
disconnect($dxchan) unless $dxchan == $DXProt::me;
}
Msg->event_loop(1, 0.05);
disconnect($dxchan) unless $dxchan == $DXProt::me;
}
Msg->event_loop(1, 0.05);
@@
-187,9
+196,9
@@
sub cease
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
- # disconnect
node
s
+ # disconnect
user
s
foreach $dxchan (DXChannel->get_all()) {
foreach $dxchan (DXChannel->get_all()) {
- next
unless
$dxchan->is_ak1a;
+ next
if
$dxchan->is_ak1a;
disconnect($dxchan) unless $dxchan == $DXProt::me;
}
Msg->event_loop(1, 0.05);
disconnect($dxchan) unless $dxchan == $DXProt::me;
}
Msg->event_loop(1, 0.05);
@@
-198,13
+207,11
@@
sub cease
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
DXUser::finish();
DXUser::finish();
+
+ # close all databases
+ DXDb::closeall;
+
dbg('chan', "DXSpider version $version ended");
Log('cluster', "DXSpider V$version stopped");
dbgclose();
dbg('chan', "DXSpider version $version ended");
Log('cluster', "DXSpider V$version stopped");
dbgclose();
@@
-219,6
+226,7
@@
sub reap
{
$SIG{'CHLD'} = \&reap;
my $cpid = wait;
{
$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
}
# this is where the input queue is dealt with and things are dispatched off to other parts of
@@
-231,15
+239,14
@@
sub process_inqueue
my $data = $self->{data};
my $dxchan = $self->{dxchan};
my ($sort, $call, $line) = $data =~ /^(\w)([A-Z0-9\-]+)\|(.*)$/;
my $data = $self->{data};
my $dxchan = $self->{dxchan};
my ($sort, $call, $line) = $data =~ /^(\w)([A-Z0-9\-]+)\|(.*)$/;
-
+ my $error;
+
# the above regexp must work
return unless ($sort && $call && $line);
# 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;
# the above regexp must work
return unless ($sort && $call && $line);
# 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;
-# dbg('chan', "<- $sort $call **CRAP**: $line");
-# return;
}
# do the really sexy console interface bit! (Who is going to do the TK interface then?)
}
# do the really sexy console interface bit! (Who is going to do the TK interface then?)
@@
-251,12
+258,11
@@
sub process_inqueue
$dxchan->start($line, $sort);
} elsif ($sort eq 'I') {
die "\$user not defined for $call" if !defined $user;
$dxchan->start($line, $sort);
} elsif ($sort eq 'I') {
die "\$user not defined for $call" if !defined $user;
-
# normal input
$dxchan->normal($line);
# normal input
$dxchan->normal($line);
-
disconnect($dxchan) if ($dxchan->{state} eq 'bye');
} elsif ($sort eq 'Z') {
disconnect($dxchan) if ($dxchan->{state} eq 'bye');
} elsif ($sort eq 'Z') {
+ $dxchan->conn(undef);
disconnect($dxchan);
} elsif ($sort eq 'D') {
; # ignored (an echo)
disconnect($dxchan);
} elsif ($sort eq 'D') {
; # ignored (an echo)
@@
-293,7
+299,7
@@
STDOUT->autoflush(1);
Log('cluster', "DXSpider V$version started");
# banner
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";
# load Prefixes
print "loading prefixes ...\n";
@@
-346,6
+352,10
@@
DXMsg::clean_old();
print "reading cron jobs ...\n";
DXCron->init();
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 {
# starting local stuff
print "doing local initialisation ...\n";
eval {
@@
-361,7
+371,7
@@
print "orft we jolly well go ...\n";
dbg('chan', "DXSpider version $version started...");
for (;;) {
my $timenow;
dbg('chan', "DXSpider version $version started...");
for (;;) {
my $timenow;
- Msg->event_loop(1, 0.
00
1);
+ Msg->event_loop(1, 0.1);
$timenow = time;
process_inqueue(); # read in lines from the input queue and despatch them
$timenow = time;
process_inqueue(); # read in lines from the input queue and despatch them
@@
-375,6
+385,7
@@
for (;;) {
DXProt::process(); # process ongoing ak1a pcxx stuff
DXConnect::process();
DXMsg::process();
DXProt::process(); # process ongoing ak1a pcxx stuff
DXConnect::process();
DXMsg::process();
+ DXDb::process();
eval {
Local::process(); # do any localised processing
};
eval {
Local::process(); # do any localised processing
};