send only pc39 and no pc21s when shuttinng down

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 8a02bfd376adf9110afd20a77363c0f740af1083..20e80ddbfe16f61978b8f5731431a94c2e19375f 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -41,11 +41,14 @@ BEGIN {
        $systime = time;
 }
 
+use DXVars;
 use Msg;
 use IntMsg;
+use Internet;
+use Listeners;
 use ExtMsg;
+use AGWConnect;
 use AGWMsg;
-use DXVars;
 use DXDebug;
 use DXLog;
 use DXLogPrint;
@@ -54,21 +57,30 @@ use DXChannel;
 use DXUser;
 use DXM;
 use DXCommandmode;
+use DXProtVars;
+use DXProtout;
 use DXProt;
 use DXMsg;
 use DXCluster;
 use DXCron;
 use DXConnect;
+use DXBearing;
+use DXDb;
+use DXHash;
+use DXDupe;
 use Prefix;
 use Bands;
+use Keps;
+use Minimuf;
+use Sun;
 use Geomag;
 use CmdAlias;
 use Filter;
-use DXDb;
 use AnnTalk;
+use BBS;
 use WCY;
-use DXDupe;
 use BadWords;
+use Timer;
 
 use Data::Dumper;
 use IO::File;
@@ -100,7 +112,7 @@ sub already_conn
        
        dbg('chan', "-> D $call $mess\n"); 
        $conn->send_now("D$call|$mess");
-       Msg->sleep(2);
+       sleep(2);
        $conn->disconnect;
 }
 
@@ -215,7 +227,7 @@ sub cease
        # disconnect users
        foreach $dxchan (DXChannel->get_all()) {
                next if $dxchan->is_node;
-               $dxchan->disconnect unless $dxchan == $DXProt::me;
+               $dxchan->disconnect(2) unless $dxchan == $DXProt::me;
        }
 
        # disconnect AGW
@@ -234,8 +246,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");
@@ -328,21 +340,22 @@ STDOUT->autoflush(1);
 # 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) {
+       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");
@@ -363,18 +376,16 @@ dbg('err', "loading user file system ...");
 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");
-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();