projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
I think I have most the SSID probs cracked.
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index 848131f70ba8d28906a98f43d685391a03cc893c..f1b467321219f222df82efaaffd7dabb8722165c 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-27,6
+27,7
@@
use Msg;
use DXVars;
use DXDebug;
use DXLog;
use DXVars;
use DXDebug;
use DXLog;
+use DXLogPrint;
use DXUtil;
use DXChannel;
use DXUser;
use DXUtil;
use DXChannel;
use DXUser;
@@
-47,8
+48,9
@@
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.4; # the version no of the software
-
+$version = 1.5; # the version no of the software
+$starttime = 0; # the starting time of the cluster
+
# handle disconnections
sub disconnect
{
# handle disconnections
sub disconnect
{
@@
-84,7
+86,8
@@
sub rec
}
# is there one already connected elsewhere in the cluster?
}
# is there one already connected elsewhere in the cluster?
- if (DXCluster->get($call)) {
+ if (($call eq $main::myalias && DXCluster->get_exact($call)) ||
+ DXCluster->get($call)) {
my $mess = DXM::msg($lang, 'concluster', $call);
dbg('chan', "-> D $call $mess\n");
$conn->send_now("D$call|$mess");
my $mess = DXM::msg($lang, 'concluster', $call);
dbg('chan', "-> D $call $mess\n");
$conn->send_now("D$call|$mess");
@@
-94,6
+97,7
@@
sub rec
return;
}
return;
}
+ # the user MAY have an SSID if local, but otherwise doesn't
my $user = DXUser->get($call);
if (!defined $user) {
$user = DXUser->new($call);
my $user = DXUser->get($call);
if (!defined $user) {
$user = DXUser->new($call);
@@
-133,6
+137,12
@@
sub cease
exit(0);
}
exit(0);
}
+# the reaper of children
+sub reap
+{
+ my $cpid = wait;
+}
+
# this is where the input queue is dealt with and things are dispatched off to other parts of
# the cluster
sub process_inqueue
# this is where the input queue is dealt with and things are dispatched off to other parts of
# the cluster
sub process_inqueue
@@
-149,8
+159,8
@@
sub process_inqueue
# handle A records
my $user = $dxchan->user;
# handle A records
my $user = $dxchan->user;
- if ($sort eq 'A') {
- $dxchan->start($line);
+ if ($sort eq 'A'
|| $sort eq 'O'
) {
+ $dxchan->start($line
, $sort
);
} elsif ($sort eq 'D') {
die "\$user not defined for $call" if !defined $user;
} elsif ($sort eq 'D') {
die "\$user not defined for $call" if !defined $user;
@@
-165,12
+175,24
@@
sub process_inqueue
}
}
}
}
+sub uptime
+{
+ my $t = $systime - $starttime;
+ my $days = int $t / 86400;
+ $t -= $days * 86400;
+ my $hours = int $t / 3600;
+ $t -= $hours * 3600;
+ my $mins = int $t / 60;
+ return sprintf "%d %02d:%02d", $days, $hours, $mins;
+}
#############################################################
#
# The start of the main line of code
#
#############################################################
#############################################################
#
# The start of the main line of code
#
#############################################################
+$starttime = $systime = time;
+
# open the debug file, set various FHs to be unbuffered
foreach (@debug) {
dbgadd($_);
# open the debug file, set various FHs to be unbuffered
foreach (@debug) {
dbgadd($_);
@@
-202,6
+224,7
@@
Msg->new_server("$clusteraddr", $clusterport, \&login);
$SIG{'INT'} = \&cease;
$SIG{'TERM'} = \&cease;
$SIG{'HUP'} = 'IGNORE';
$SIG{'INT'} = \&cease;
$SIG{'TERM'} = \&cease;
$SIG{'HUP'} = 'IGNORE';
+$SIG{'CHLD'} = \&reap;
# read in system messages
DXM->init();
# read in system messages
DXM->init();
@@
-221,9
+244,10
@@
Spot->init();
# put in a DXCluster node for us here so we can add users and take them away
DXNode->new(0, $mycall, 0, 1, $DXProt::myprot_version);
# put in a DXCluster node for us here so we can add users and take them away
DXNode->new(0, $mycall, 0, 1, $DXProt::myprot_version);
-# read in any existing message headers
+# read in any existing message headers
and clean out old crap
print "reading existing message headers\n";
DXMsg->init();
print "reading existing message headers\n";
DXMsg->init();
+DXMsg::clean_old();
# read in any cron jobs
print "reading cron jobs\n";
# read in any cron jobs
print "reading cron jobs\n";
@@
-247,6
+271,9
@@
for (;;) {
DXProt::process(); # process ongoing ak1a pcxx stuff
DXConnect::process();
}
DXProt::process(); # process ongoing ak1a pcxx stuff
DXConnect::process();
}
+ if ($decease) {
+ last if --$decease <= 0;
+ }
}
}