added $@ and $! to see if we can store this stuff

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 0e93c4e9fc1c1e250df2d43e99aa4d5abb972a2d..dd12a9dfe22dc564058cadadb463bde7994f281a 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -73,6 +73,7 @@ $systime = 0;                                 # the time now (in seconds)
 $version = "1.35";                             # 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
@@ -103,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) {
+                       disconnect($dxchan);
+               }
                return;
        }
        
@@ -229,6 +232,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 +268,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)