X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=54295e4b7beaaec871a50d39187319f5ffd6aeaf;hb=f4bc6091a243be2891148902d41e921e171e1a44;hp=373e595c9c25cd74e501d9fda29de17f3d3c5711;hpb=780d82f8b97e67e93d4097de639f1e375223cda0;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 373e595c..54295e4b 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -70,7 +70,7 @@ package main;
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.39";				# the version no of the software
+$version = "1.40";				# 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
@@ -103,9 +103,11 @@ sub rec
 	my ($conn, $msg, $err) = @_;
 	my $dxchan = DXChannel->get_by_cnum($conn); # get the dxconnnect object for this message
 	
-	if (defined $err && $err) {
+	if (!defined $msg || (defined $err && $err)) {
 		if ($dxchan) {
 			$dxchan->disconnect;
+		} elsif ($conn) {
+			$conn->disconnect;
 		}
 		return;
 	}
@@ -369,11 +371,17 @@ dbg('local', "Local::init error $@") if $@;
 # this, such as it is, is the main loop!
 print "orft we jolly well go ...\n";
 dbg('chan', "DXSpider version $version started...");
+
+open(DB::OUT, "|tee /tmp/aa");
+
 for (;;) {
 	my $timenow;
+	$DB::trace = 1;
+	
 	Msg->event_loop(1, 0.1);
 	$timenow = time;
 	process_inqueue();			# read in lines from the input queue and despatch them
+	$DB::trace = 0;
 	
 	# do timed stuff, ongoing processing happens one a second
 	if ($timenow != $systime) {