projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
trying again after broken pipe error
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index 3bed469c69085a786766ddc96008769ce3a39151..d3feaa39c813c7936d72fca0abd4a1cdac6ee12a 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-206,8
+206,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
+219,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
+241,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
+376,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
+388,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++ };