# try to create and lock a lockfile (this isn't atomic but
# should do for now
- my $lockfn = "$root/perl/cluster.lock"; # lock file name
+ $lockfn = "$root/perl/cluster.lck"; # lock file name
if (-e $lockfn) {
open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
my $pid = <CLLOCK>;
open(CLLOCK, ">$lockfn") or die "Can't open Lockfile ($lockfn) $!";
print CLLOCK "$$\n";
close CLLOCK;
+
+ $is_win = ($^O =~ /^MS/ || $^O =~ /^OS-2/) ? 1 : 0; # is it Windows?
+ $systime = time;
}
+use DXVars;
use Msg;
use IntMsg;
+use Internet;
+use Listeners;
use ExtMsg;
-use DXVars;
+use AGWConnect;
+use AGWMsg;
use DXDebug;
use DXLog;
use DXLogPrint;
use DXUser;
use DXM;
use DXCommandmode;
+use DXProtVars;
+use DXProtout;
use DXProt;
use DXMsg;
use DXCluster;
use DXCron;
use DXConnect;
+use DXBearing;
+use DXDb;
+use DXHash;
+use DXDupe;
use Prefix;
use Bands;
+use Keps;
+use Minimuf;
+use Sun;
use Geomag;
use CmdAlias;
use Filter;
-use DXDb;
use AnnTalk;
+use BBS;
use WCY;
-use DXDupe;
use BadWords;
+use Timer;
use Data::Dumper;
+use IO::File;
use Fcntl ':flock';
use POSIX ":sys_wait_h";
package main;
use strict;
-use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects $zombies $root
- @listeners $lang $myalias @debug $userfn $clusteraddr $clusterport $mycall $decease );
+use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects
+ $zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr
+ $clusterport $mycall $decease $build $is_win
+ );
@inqueue = (); # the main input queue, an array of hashes
$systime = 0; # the time now (in seconds)
$version = "1.47"; # 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
@listeners = (); # list of listeners
{
my $dxchan = shift;
$dxchan->{conn}->set_error(undef) if exists $dxchan->{conn};
- $dxchan->disconnect;
+ $dxchan->disconnect(1);
}
# handle incoming messages
# set up the basic channel info
# is there one already connected to me - locally?
my $user = DXUser->get($call);
- if ($sort ne 'O' && Msg->conns($call)) {
+ my $dxchan = DXChannel->get($call);
+ if ($dxchan) {
my $mess = DXM::msg($lang, ($user && $user->is_node) ? 'concluster' : 'conother', $call, $main::mycall);
already_conn($conn, $call, $mess);
return;
}
# create the channel
- my $dxchan;
$dxchan = DXCommandmode->new($call, $conn, $user) if $user->is_user;
$dxchan = DXProt->new($call, $conn, $user) if $user->is_node;
$dxchan = BBS->new($call, $conn, $user) if $user->is_bbs;
# disconnect users
foreach $dxchan (DXChannel->get_all()) {
next if $dxchan->is_node;
- $dxchan->disconnect unless $dxchan == $DXProt::me;
+ $dxchan->disconnect(2) unless $dxchan == $DXProt::me;
}
+
+ # disconnect AGW
+ AGWMsg::finish();
+
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
Msg->event_loop(1, 0.05);
DXDb::closeall;
# close all listeners
- for (@listeners) {
- $_->close_server;
+ foreach my $l (@listeners) {
+ $l->close_server;
}
- dbg('chan', "DXSpider version $version ended");
- Log('cluster', "DXSpider V$version stopped");
+ dbg('chan', "DXSpider version $version, build $build ended");
+ Log('cluster', "DXSpider V$version, build $build ended");
dbgclose();
Logclose();
unlink $lockfn;
my $mins = int $t / 60;
return sprintf "%d %02d:%02d", $days, $hours, $mins;
}
+
+sub AGWrestart
+{
+ AGWMsg::init(\&new_channel);
+}
+
#############################################################
#
# The start of the main line of code
}
STDOUT->autoflush(1);
-Log('cluster', "DXSpider V$version started");
+# calculate build number
+$build = $main::version;
+
+my @fn;
+open(CL, "$main::root/perl/cluster.pl") or die "Cannot open cluster.pl $!";
+while (<CL>) {
+ next unless /^use\s+([\w:_]+)/;
+ push @fn, $1;
+}
+close CL;
+foreach my $fn (@fn) {
+ open(CL, "$main::root/perl/${fn}.pm") or next;
+ while (<CL>) {
+ if (/^#\s+\$Id:\s+[\w\._]+,v\s+(\d+\.\d+)/ ) {
+ $build += $1;
+ last;
+ }
+ }
+ close CL;
+}
+
+Log('cluster', "DXSpider V$version, build $build started");
# banner
-dbg('err', "DXSpider DX Cluster Version $version", "Copyright (c) 1998-2001 Dirk Koopman G1TLH");
+dbg('err', "DXSpider Version $version, build $build started", "Copyright (c) 1998-2001 Dirk Koopman G1TLH");
# load Prefixes
dbg('err', "loading prefixes ...");
DXUser->init($userfn, 1);
# start listening for incoming messages/connects
-use Listeners;
-
dbg('err', "starting listeners ...");
my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
$conn->conns("Server $clusteraddr/$clusterport");
push @listeners, $conn;
dbg('err', "Internal port: $clusteraddr $clusterport");
-for (@main::listen) {
- $conn = ExtMsg->new_server($_->[0], $_->[1], \&login);
- $conn->conns("Server $_->[0]/$_->[1]");
+foreach my $l (@main::listen) {
+ $conn = ExtMsg->new_server($l->[0], $l->[1], \&login);
+ $conn->conns("Server $l->[0]/$l->[1]");
push @listeners, $conn;
- dbg('err', "External Port: $_->[0] $_->[1]");
+ dbg('err', "External Port: $l->[0] $l->[1]");
}
+AGWrestart();
# load bad words
dbg('err', "load badwords: " . (BadWords::load or "Ok"));
# prime some signals
-unless ($^O =~ /^MS/) {
+unless ($is_win) {
unless ($DB::VERSION) {
$SIG{INT} = \&cease;
$SIG{TERM} = \&cease;
for (;;) {
# $DB::trace = 1;
- Msg->event_loop(10, 0.001);
+ Msg->event_loop(10, 0.010);
my $timenow = time;
process_inqueue(); # read in lines from the input queue and despatch them
# $DB::trace = 0;
DXDb::process();
DXUser::process();
DXDupe::process();
-
+ AGWMsg::process();
+
eval {
Local::process(); # do any localised processing
};
projects / spider.git / blobdiff