The guts of the new Msg system

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index a126b20b8f91c7cb4efa62b1db9673f08ee10344..d34a3337b270cf27a1c912e2a17594f1047ed77e 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -38,8 +38,9 @@ BEGIN {
        close CLLOCK;
 }
 
-
 use Msg;
+use IntMsg;
+use ExtMsg;
 use DXVars;
 use DXDebug;
 use DXLog;
@@ -79,19 +80,13 @@ package main;
 
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
-$version = "1.45";                             # the version no of the software
+$version = "1.47";                             # the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 $lockfn = "cluster.lock";       # lock file name
 @outstanding_connects = ();     # list of outstanding connects
-      
-# handle disconnections
-sub disconnect
-{
-       my $dxchan = shift;
-       return if !defined $dxchan;
-       $dxchan->disconnect();
-}
+@listeners = ();                               # list of listeners
 
+      
 # send a message to call on conn and disconnect
 sub already_conn
 {
@@ -103,7 +98,7 @@ sub already_conn
        dbg('chan', "-> Z $call bye\n");
        $conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
        sleep(1);
-       $conn->disconnect();
+       $conn->disconnect;
 }
 
 # handle incoming messages
@@ -206,19 +201,15 @@ sub cease
        # disconnect nodes
        foreach $dxchan (DXChannel->get_all()) {
                next unless $dxchan->is_node;
-               disconnect($dxchan) unless $dxchan == $DXProt::me;
+           $dxchan->disconnect unless $dxchan == $DXProt::me;
        }
        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);
 
        # disconnect users
        foreach $dxchan (DXChannel->get_all()) {
                next if $dxchan->is_node;
-               disconnect($dxchan) unless $dxchan == $DXProt::me;
+               $dxchan->disconnect unless $dxchan == $DXProt::me;
        }
        Msg->event_loop(1, 0.05);
        Msg->event_loop(1, 0.05);
@@ -231,7 +222,12 @@ sub cease
 
        # close all databases
        DXDb::closeall;
-       
+
+       # close all listeners
+       for (@listeners) {
+               $_->close_server;
+       }
+
        dbg('chan', "DXSpider version $version ended");
        Log('cluster', "DXSpider V$version stopped");
        dbgclose();
@@ -277,10 +273,10 @@ sub process_inqueue
                die "\$user not defined for $call" if !defined $user;
                # normal input
                $dxchan->normal($line);
-               disconnect($dxchan) if ($dxchan->{state} eq 'bye');
+               $dxchan->disconnect if ($dxchan->{state} eq 'bye');
        } elsif ($sort eq 'Z') {
                $dxchan->conn(undef);
-               disconnect($dxchan);
+               $dxchan->disconnect;
        } elsif ($sort eq 'D') {
                ;                       # ignored (an echo)
        } else {
@@ -317,7 +313,7 @@ STDOUT->autoflush(1);
 Log('cluster', "DXSpider V$version started");
 
 # banner
-dbg('err', "DXSpider DX Cluster Version $version", "Copyright (c) 1998-2000 Dirk Koopman G1TLH");
+dbg('err', "DXSpider DX Cluster Version $version", "Copyright (c) 1998-2001 Dirk Koopman G1TLH");
 
 # load Prefixes
 dbg('err', "loading prefixes ...");
@@ -332,28 +328,39 @@ dbg('err', "loading user file system ...");
 DXUser->init($userfn, 1);
 
 # start listening for incoming messages/connects
-dbg('err', "starting listener ...");
-Msg->new_server("$clusteraddr", $clusterport, \&login);
+use Listeners;
+
+dbg('err', "starting listeners ...");
+push @listeners, IntMsg->new_server("$clusteraddr", $clusterport, \&login);
+dbg('err', "Internal port: $clusteraddr $clusterport");
+for (@main::listen) {
+       push @listeners, ExtMsg->new_server($_->[0], $_->[1], \&login);
+       dbg('err', "External Port: $_->[0] $_->[1]");
+}
 
 # load bad words
 dbg('err', "load badwords: " . (BadWords::load or "Ok"));
 
 # prime some signals
-$SIG{INT} = \&cease;
-$SIG{TERM} = \&cease;
-$SIG{HUP} = 'IGNORE';
-$SIG{CHLD} = sub { $zombies++ };
-
-$SIG{PIPE} = sub {     dbg('err', "Broken PIPE signal received"); };
-$SIG{IO} = sub {       dbg('err', "SIGIO received"); };
-$SIG{WINCH} = $SIG{STOP} = $SIG{CONT} = 'IGNORE';
-$SIG{KILL} = 'DEFAULT';     # as if it matters....
-
-# catch the rest with a hopeful message
-for (keys %SIG) {
-       if (!$SIG{$_}) {
-#              dbg('chan', "Catching SIG $_");
-               $SIG{$_} = sub { my $sig = shift;       DXDebug::confess("Caught signal $sig");  }; 
+unless ($^O =~ /^MS/) {
+       unless ($DB::VERSION) {
+               $SIG{INT} = \&cease;
+               $SIG{TERM} = \&cease;
+       }
+       $SIG{HUP} = 'IGNORE';
+       $SIG{CHLD} = sub { $zombies++ };
+       
+       $SIG{PIPE} = sub {      dbg('err', "Broken PIPE signal received"); };
+       $SIG{IO} = sub {        dbg('err', "SIGIO received"); };
+       $SIG{WINCH} = $SIG{STOP} = $SIG{CONT} = 'IGNORE';
+       $SIG{KILL} = 'DEFAULT';     # as if it matters....
+
+       # catch the rest with a hopeful message
+       for (keys %SIG) {
+               if (!$SIG{$_}) {
+                       #               dbg('chan', "Catching SIG $_");
+                       $SIG{$_} = sub { my $sig = shift;       DXDebug::confess("Caught signal $sig");  }; 
+               }
        }
 }