projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
put in fix for arcluster bug
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index 185ec787af1c43b87599e7870fd54cccf816e912..35881d452d88f96ee82f6516e0b59e23bdb4622e 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-25,7
+25,7
@@
BEGIN {
# try to create and lock a lockfile (this isn't atomic but
# should do for now
# try to create and lock a lockfile (this isn't atomic but
# should do for now
-
my $lockfn = "$root/perl/cluster.lo
ck"; # lock file name
+
$lockfn = "$root/perl/cluster.l
ck"; # lock file name
if (-e $lockfn) {
open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
my $pid = <CLLOCK>;
if (-e $lockfn) {
open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
my $pid = <CLLOCK>;
@@
-38,14
+38,17
@@
BEGIN {
close CLLOCK;
$is_win = ($^O =~ /^MS/ || $^O =~ /^OS-2/) ? 1 : 0; # is it Windows?
close CLLOCK;
$is_win = ($^O =~ /^MS/ || $^O =~ /^OS-2/) ? 1 : 0; # is it Windows?
-
+ $systime = time;
}
}
+use DXVars;
use Msg;
use IntMsg;
use Msg;
use IntMsg;
+use Internet;
+use Listeners;
use ExtMsg;
use ExtMsg;
+use AGWConnect;
use AGWMsg;
use AGWMsg;
-use DXVars;
use DXDebug;
use DXLog;
use DXLogPrint;
use DXDebug;
use DXLog;
use DXLogPrint;
@@
-54,21
+57,34
@@
use DXChannel;
use DXUser;
use DXM;
use DXCommandmode;
use DXUser;
use DXM;
use DXCommandmode;
+use DXProtVars;
+use DXProtout;
use DXProt;
use DXMsg;
use DXCluster;
use DXCron;
use DXConnect;
use DXProt;
use DXMsg;
use DXCluster;
use DXCron;
use DXConnect;
+use DXBearing;
+use DXDb;
+use DXHash;
+use DXDupe;
use Prefix;
use Prefix;
+use Spot;
use Bands;
use Bands;
+use Keps;
+use Minimuf;
+use Sun;
use Geomag;
use CmdAlias;
use Filter;
use Geomag;
use CmdAlias;
use Filter;
-use DXDb;
use AnnTalk;
use AnnTalk;
+use BBS;
use WCY;
use WCY;
-use DXDupe;
use BadWords;
use BadWords;
+use Timer;
+use Route;
+use Route::Node;
+use Route::User;
use Data::Dumper;
use IO::File;
use Data::Dumper;
use IO::File;
@@
-82,14
+98,13
@@
package main;
use strict;
use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects
$zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr
use strict;
use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects
$zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr
- $clusterport $mycall $decease $build $is_win
+ $clusterport $mycall $decease $build $is_win
$routeroot
);
@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
7
"; # the version no of the software
+$version = "1.4
8
"; # the version no of the software
$starttime = 0; # the starting time of the cluster
$starttime = 0; # the starting time of the cluster
-$lockfn = "cluster.lock"; # lock file name
#@outstanding_connects = (); # list of outstanding connects
@listeners = (); # list of listeners
#@outstanding_connects = (); # list of outstanding connects
@listeners = (); # list of listeners
@@
-98,10
+113,11
@@
$lockfn = "cluster.lock"; # lock file name
sub already_conn
{
my ($conn, $call, $mess) = @_;
sub already_conn
{
my ($conn, $call, $mess) = @_;
-
+
+ $conn->disable_read(1);
dbg('chan', "-> D $call $mess\n");
$conn->send_now("D$call|$mess");
dbg('chan', "-> D $call $mess\n");
$conn->send_now("D$call|$mess");
-
Msg->
sleep(2);
+ sleep(2);
$conn->disconnect;
}
$conn->disconnect;
}
@@
-135,7
+151,7
@@
sub new_channel
;
} else {
if (my $ref = DXCluster->get_exact($call)) {
;
} else {
if (my $ref = DXCluster->get_exact($call)) {
- my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
+ my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->
dxchan
call);
already_conn($conn, $call, $mess);
return;
}
already_conn($conn, $call, $mess);
return;
}
@@
-143,7
+159,7
@@
sub new_channel
$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
} else {
if (my $ref = DXCluster->get_exact($call)) {
$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
} else {
if (my $ref = DXCluster->get_exact($call)) {
- my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
+ my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->
dxchan
call);
already_conn($conn, $call, $mess);
return;
}
already_conn($conn, $call, $mess);
return;
}
@@
-195,8
+211,10
@@
sub cease
{
my $dxchan;
{
my $dxchan;
- $SIG{'TERM'} = 'IGNORE';
- $SIG{'INT'} = 'IGNORE';
+ unless ($is_win) {
+ $SIG{'TERM'} = 'IGNORE';
+ $SIG{'INT'} = 'IGNORE';
+ }
DXUser::sync;
DXUser::sync;
@@
-206,28
+224,21
@@
sub cease
dbg('local', "Local::finish error $@") if $@;
# disconnect nodes
dbg('local', "Local::finish error $@") if $@;
# disconnect nodes
- foreach $dxchan (DXChannel->get_all()) {
- next unless $dxchan->is_node;
- $dxchan->disconnect unless $dxchan == $DXProt::me;
+ foreach $dxchan (DXChannel->get_all_nodes) {
+ $dxchan->disconnect(2) unless $dxchan == $DXProt::me;
}
}
- Msg->event_loop(1, 0.05);
- Msg->event_loop(1, 0.05);
+ Msg->event_loop(100, 0.01);
# disconnect users
# disconnect users
- foreach $dxchan (DXChannel->get_all()) {
- next if $dxchan->is_node;
- $dxchan->disconnect unless $dxchan == $DXProt::me;
+ foreach $dxchan (DXChannel->get_all_users) {
+ $dxchan->disconnect;
}
# disconnect AGW
AGWMsg::finish();
}
# disconnect AGW
AGWMsg::finish();
-
- 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);
+
+ # end everything else
+ Msg->event_loop(100, 0.01);
DXUser::finish();
DXDupe::finish();
DXUser::finish();
DXDupe::finish();
@@
-235,8
+246,8
@@
sub cease
DXDb::closeall;
# close all listeners
DXDb::closeall;
# close all listeners
- for (@listeners) {
- $
_
->close_server;
+ for
each my $l
(@listeners) {
+ $
l
->close_server;
}
dbg('chan', "DXSpider version $version, build $build ended");
}
dbg('chan', "DXSpider version $version, build $build ended");
@@
-329,21
+340,23
@@
STDOUT->autoflush(1);
# calculate build number
$build = $main::version;
# calculate build number
$build = $main::version;
-if (opendir(DIR, "$main::root/perl")) {
- my @d = readdir(DIR);
- closedir(DIR);
- foreach my $fn (@d) {
- if ($fn =~ /^cluster\.pl$/ || $fn =~ /\.pm$/) {
- my $f = new IO::File "$main::root/perl/$fn" or next;
- while (<$f>) {
- if (/^#\s+\$Id:\s+[\w\._]+,v\s+(\d+\.\d+)/ ) {
- $build += $1;
- last;
- }
- }
- $f->close;
+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) {
+ $fn =~ s|::|/|g;
+ 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");
}
Log('cluster', "DXSpider V$version, build $build started");
@@
-364,18
+377,16
@@
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
-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");
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]");
+for
each my $l
(@main::listen) {
+ $conn = ExtMsg->new_server($
l->[0], $l
->[1], \&login);
+ $conn->conns("Server $
l->[0]/$l
->[1]");
push @listeners, $conn;
push @listeners, $conn;
- dbg('err', "External Port: $
_->[0] $_
->[1]");
+ dbg('err', "External Port: $
l->[0] $l
->[1]");
}
AGWrestart();
}
AGWrestart();
@@
-383,11
+394,11
@@
AGWrestart();
dbg('err', "load badwords: " . (BadWords::load or "Ok"));
# prime some signals
dbg('err', "load badwords: " . (BadWords::load or "Ok"));
# prime some signals
+unless ($DB::VERSION) {
+ $SIG{INT} = $SIG{TERM} = sub { $decease = 1 };
+}
+
unless ($is_win) {
unless ($is_win) {
- unless ($DB::VERSION) {
- $SIG{INT} = \&cease;
- $SIG{TERM} = \&cease;
- }
$SIG{HUP} = 'IGNORE';
$SIG{CHLD} = sub { $zombies++ };
$SIG{HUP} = 'IGNORE';
$SIG{CHLD} = sub { $zombies++ };
@@
-427,6
+438,7
@@
DXProt->init();
# put in a DXCluster node for us here so we can add users and take them away
DXNode->new($DXProt::me, $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($DXProt::me, $mycall, 0, 1, $DXProt::myprot_version);
+$routeroot = Route::Node->new($mycall, $version, Route::here($DXProt::me->here)|Route::conf($DXProt::me->confmode));
# read in any existing message headers and clean out old crap
dbg('err', "reading existing message headers ...");
# read in any existing message headers and clean out old crap
dbg('err', "reading existing message headers ...");