fixed confusion over DXCluster->get_exact and DXUser->get

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 0e93c4e9fc1c1e250df2d43e99aa4d5abb972a2d..a84918bd10e4616eed0725256194ab57b352485b 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -70,9 +70,10 @@ package main;
 
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
-$version = "1.35";                             # the version no of the software
+$version = "1.37";                             # 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
@@ -93,7 +94,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
@@ -103,28 +104,30 @@ sub rec
        my $dxchan = DXChannel->get_by_cnum($conn); # get the dxconnnect object for this message
        
        if (defined $err && $err) {
-               disconnect($dxchan) if defined $dxchan;
+               if ($dxchan) {
+                       $dxchan->disconnect;
+               }
                return;
        }
        
        # set up the basic channel info - this needs a bit more thought - there is duplication here
        if (!defined $dxchan) {
                my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
-
-                # is there one already connected to me ? 
+ 
+               # is there one already connected to me - locally? 
                my $user = DXUser->get($call);
                if (DXChannel->get($call)) {
-                       my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
+                       my $mess = DXM::msg($lang, ($user && $user->sort eq 'A') ? 'concluster' : 'conother', $call);
                        already_conn($conn, $call, $mess);
                        return;
                }
                
-               # is there one already connected elsewhere in the cluster (and not a cluster)
+               # is there one already connected elsewhere in the cluster?
                if ($user) {
                        if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
                                ;
                        } else {
-                               if (DXCluster->get($call) || DXChannel->get($call)) {
+                               if (DXCluster->get_exact($call)) {
                                        my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
                                        already_conn($conn, $call, $mess);
                                        return;
@@ -132,7 +135,7 @@ sub rec
                        }
                        $user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
                } else {
-                       if (DXCluster->get($call)) {
+                       if (DXCluster->get_exact($call)) {
                                my $mess = DXM::msg($lang, 'conother', $call);
                                already_conn($conn, $call, $mess);
                                return;
@@ -181,9 +184,9 @@ sub cease
        };
        dbg('local', "Local::finish error $@") if $@;
 
-       # disconnect users
+       # disconnect nodes
        foreach $dxchan (DXChannel->get_all()) {
-               next if $dxchan->is_ak1a;
+               next unless $dxchan->is_ak1a;
                disconnect($dxchan) unless $dxchan == $DXProt::me;
        }
        Msg->event_loop(1, 0.05);
@@ -193,9 +196,9 @@ sub cease
        Msg->event_loop(1, 0.05);
        Msg->event_loop(1, 0.05);
 
-       # disconnect nodes
+       # disconnect users
        foreach $dxchan (DXChannel->get_all()) {
-               next unless $dxchan->is_ak1a;
+               next if $dxchan->is_ak1a;
                disconnect($dxchan) unless $dxchan == $DXProt::me;
        }
        Msg->event_loop(1, 0.05);
@@ -204,12 +207,6 @@ sub cease
        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);
-       Msg->event_loop(1, 0.05);
-       Msg->event_loop(1, 0.05);
-       Msg->event_loop(1, 0.05);
        DXUser::finish();
 
        # close all databases
@@ -229,6 +226,7 @@ sub reap
 {
        $SIG{'CHLD'} = \&reap;
        my $cpid = wait;
+       @outstanding_connects = grep {$_->{pid} != $cpid} @outstanding_connects;
 }
 
 # this is where the input queue is dealt with and things are dispatched off to other parts of
@@ -264,6 +262,7 @@ sub process_inqueue
                $dxchan->normal($line);
                disconnect($dxchan) if ($dxchan->{state} eq 'bye');
        } elsif ($sort eq 'Z') {
+               $dxchan->conn(undef);
                disconnect($dxchan);
        } elsif ($sort eq 'D') {
                ;                       # ignored (an echo)
@@ -300,7 +299,7 @@ STDOUT->autoflush(1);
 Log('cluster', "DXSpider V$version started");
 
 # banner
-print "DXSpider DX Cluster Version $version\nCopyright (c) 1998 Dirk Koopman G1TLH\n";
+print "DXSpider DX Cluster Version $version\nCopyright (c) 1998-1999 Dirk Koopman G1TLH\n";
 
 # load Prefixes
 print "loading prefixes ...\n";