projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed cluster copyright date
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index b67b9ff88e98b4c150a29d77dd61897ded2d0370..d3ab1871c438c6ed2f3a1e5adcff97d9c5733edf 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-64,13
+64,11
@@
use Data::Dumper;
use Fcntl ':flock';
use Fcntl ':flock';
-use Carp qw(cluck);
-
package main;
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
package main;
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
-$version = "1.
35
"; # the version no of the software
+$version = "1.
41
"; # 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
$starttime = 0; # the starting time of the cluster
$lockfn = "cluster.lock"; # lock file name
@outstanding_connects = (); # list of outstanding connects
@@
-94,7
+92,7
@@
sub already_conn
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;
+ $conn->disconnect
()
;
}
# handle incoming messages
}
# handle incoming messages
@@
-103,29
+101,33
@@
sub rec
my ($conn, $msg, $err) = @_;
my $dxchan = DXChannel->get_by_cnum($conn); # get the dxconnnect object for this message
my ($conn, $msg, $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 (!defined $msg || (defined $err && $err)) {
+ if ($dxchan) {
+ $dxchan->disconnect;
+ } elsif ($conn) {
+ $conn->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;
@@
-133,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;
@@
-182,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);
@@
-194,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);
@@
-205,12
+207,6
@@
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();
# close all databases
DXUser::finish();
# close all databases
@@
-266,6
+262,7
@@
sub process_inqueue
$dxchan->normal($line);
disconnect($dxchan) if ($dxchan->{state} eq 'bye');
} elsif ($sort eq 'Z') {
$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)
disconnect($dxchan);
} elsif ($sort eq 'D') {
; # ignored (an echo)
@@
-302,22
+299,22
@@
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"
;
+
dbg('err', "DXSpider DX Cluster Version $version", "Copyright (c) 1998-2000 Dirk Koopman G1TLH")
;
# load Prefixes
# load Prefixes
-
print "loading prefixes ...\n"
;
+
dbg('err', "loading prefixes ...")
;
Prefix::load();
# load band data
Prefix::load();
# load band data
-
print "loading band data ...\n"
;
+
dbg('err', "loading band data ...")
;
Bands::load();
# initialise User file system
Bands::load();
# initialise User file system
-
print "loading user file system ...\n"
;
+
dbg('err', "loading user file system ...")
;
DXUser->init($userfn, 1);
# start listening for incoming messages/connects
DXUser->init($userfn, 1);
# start listening for incoming messages/connects
-
print "starting listener ...\n"
;
+
dbg('err', "starting listener ...")
;
Msg->new_server("$clusteraddr", $clusterport, \&login);
# prime some signals
Msg->new_server("$clusteraddr", $clusterport, \&login);
# prime some signals
@@
-339,7
+336,7
@@
Geomag->init();
Spot->init();
# initialise the protocol engine
Spot->init();
# initialise the protocol engine
-
print "reading in duplicate spot and WWV info ...\n"
;
+
dbg('err', "reading in duplicate spot and WWV info ...")
;
DXProt->init();
DXProt->init();
@@
-347,36
+344,41
@@
DXProt->init();
DXNode->new(0, $mycall, 0, 1, $DXProt::myprot_version);
# read in any existing message headers and clean out old crap
DXNode->new(0, $mycall, 0, 1, $DXProt::myprot_version);
# read in any existing message headers and clean out old crap
-
print "reading existing message headers ...\n"
;
+
dbg('err', "reading existing message headers ...")
;
DXMsg->init();
DXMsg::clean_old();
# read in any cron jobs
DXMsg->init();
DXMsg::clean_old();
# read in any cron jobs
-
print "reading cron jobs ...\n"
;
+
dbg('err', "reading cron jobs ...")
;
DXCron->init();
# read in database descriptors
DXCron->init();
# read in database descriptors
-
print "reading database descriptors ...\n"
;
+
dbg('err', "reading database descriptors ...")
;
DXDb::load();
# starting local stuff
DXDb::load();
# starting local stuff
-
print "doing local initialisation ...\n"
;
+
dbg('err', "doing local initialisation ...")
;
eval {
Local::init();
};
dbg('local', "Local::init error $@") if $@;
# print various flags
eval {
Local::init();
};
dbg('local', "Local::init error $@") if $@;
# print various flags
-#
print "useful info - \$^D: $^D \$^W: $^W \$^S: $^S \$^P: $^P\n"
;
+#
dbg('err', "seful info - \$^D: $^D \$^W: $^W \$^S: $^S \$^P: $^P")
;
# this, such as it is, is the main loop!
# this, such as it is, is the main loop!
-print "orft we jolly well go ...\n";
-dbg('chan', "DXSpider version $version started...");
+dbg('err', "orft we jolly well go ...");
+
+#open(DB::OUT, "|tee /tmp/aa");
+
for (;;) {
my $timenow;
for (;;) {
my $timenow;
+# $DB::trace = 1;
+
Msg->event_loop(1, 0.1);
$timenow = time;
process_inqueue(); # read in lines from the input queue and despatch them
Msg->event_loop(1, 0.1);
$timenow = time;
process_inqueue(); # read in lines from the input queue and despatch them
+# $DB::trace = 0;
# do timed stuff, ongoing processing happens one a second
if ($timenow != $systime) {
# do timed stuff, ongoing processing happens one a second
if ($timenow != $systime) {