projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change the max number of days to search for spots to 100
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index 3bed469c69085a786766ddc96008769ce3a39151..d321cba5fcd9b971e4cb048857aa539065daa253 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-69,6
+69,7
@@
use DXDb;
use DXHash;
use DXDupe;
use Prefix;
use DXHash;
use DXDupe;
use Prefix;
+use Spot;
use Bands;
use Keps;
use Minimuf;
use Bands;
use Keps;
use Minimuf;
@@
-99,7
+100,7
@@
use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects
@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
#@outstanding_connects = (); # list of outstanding connects
@listeners = (); # list of listeners
$starttime = 0; # the starting time of the cluster
#@outstanding_connects = (); # list of outstanding connects
@listeners = (); # list of listeners
@@
-109,7
+110,8
@@
$starttime = 0; # the starting time of the cluster
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");
sleep(2);
dbg('chan', "-> D $call $mess\n");
$conn->send_now("D$call|$mess");
sleep(2);
@@
-146,7
+148,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;
}
@@
-154,7
+156,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;
}
@@
-206,8
+208,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;
@@
-217,28
+221,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();
@@
-246,8
+243,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");
@@
-381,11
+378,11
@@
my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
$conn->conns("Server $clusteraddr/$clusterport");
push @listeners, $conn;
dbg('err', "Internal port: $clusteraddr $clusterport");
$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();
@@
-393,11
+390,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++ };