fixed a missing get_all_user_calls

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index b67b9ff88e98b4c150a29d77dd61897ded2d0370..d9827a651fc8daf635f886aae7ef1fd6dbfdf717 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -94,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
@@ -104,7 +104,9 @@ 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;
        }
        
@@ -182,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);
@@ -194,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);
@@ -205,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
@@ -266,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)
@@ -302,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";