fix pc39 properly on shutdown?

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 3bed469c69085a786766ddc96008769ce3a39151..5c53e113d0e8dbc02907e6e055f334d6df03bc4b 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -217,28 +217,21 @@ sub cease
        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
-       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();
-       
-       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();
 
@@ -246,8 +239,8 @@ sub cease
        DXDb::closeall;
 
        # close all listeners
-       for (@listeners) {
-               $_->close_server;
+       foreach my $l (@listeners) {
+               $l->close_server;
        }
 
        dbg('chan', "DXSpider version $version, build $build ended");
@@ -381,11 +374,11 @@ 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();