fix pc39 properly on shutdown?

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 20e80ddbfe16f61978b8f5731431a94c2e19375f..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(2) 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();