--- loncom/loncnew	2004/08/30 11:01:04	1.52
+++ loncom/loncnew	2004/09/21 10:54:43	1.56
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # lonc maintains the connections to remote computers
 #
-# $Id: loncnew,v 1.52 2004/08/30 11:01:04 foxr Exp $
+# $Id: loncnew,v 1.56 2004/09/21 10:54:43 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -104,6 +104,7 @@ my $ConnectionRetries=2;	# Number of con
 my $ConnectionRetriesLeft=2;	# Number of connection retries remaining.
 my $LondVersion     = "unknown"; # Version of lond we talk with.
 my $KeyMode         = "";       # e.g. ssl, local, insecure from last connect.
+my $LondConnecting  = 0;       # True when a connection is being built.
 
 #
 #   The hash below gives the HTML format for log messages
@@ -275,6 +276,7 @@ sub SocketTimeout {
     $ConnectionRetriesLeft--;
     if($ConnectionRetriesLeft <= 0) {
 	Log("CRITICAL", "Host marked DEAD: ".GetServerHost());
+	$LondConnecting = 0;
     }
 
 }
@@ -310,6 +312,7 @@ sub Tick {
 	if($IdleSeconds > $IdleTimeout) { # Prune a connection...
 	    my $Socket = $IdleConnections->pop();
 	    KillSocket($Socket);
+	    $IdleSeconds = 0;	# Otherwise all connections get trimmed to fast.
 	}
     } else {
 	$IdleSeconds = 0;	# Reset idle count if not idle.
@@ -330,21 +333,18 @@ sub Tick {
     #
     
     my $Requests = $WorkQueue->Count();
-    if (($ConnectionCount == 0)  && ($Requests > 0)) { 
+    if (($ConnectionCount == 0)  && ($Requests > 0) && (!$LondConnecting)) { 
 	if ($ConnectionRetriesLeft > 0) {
-	    my $Connections = ($Requests <= $MaxConnectionCount) ?
-		$Requests : $MaxConnectionCount;
-	    Debug(5,"Work but no connections, start ".$Connections." of them");
-	    my $successCount = 0;
-	    for (my $i =0; $i < $Connections; $i++) {
-		$successCount += MakeLondConnection();
-	    }
-	    if($successCount == 0) { # All connections failed:
+	    Debug(5,"Work but no connections, Make a new one");
+	    my $success;
+	    $success    = &MakeLondConnection;
+	    if($success == 0) { # All connections failed:
 		Debug(5,"Work in queue failed to make any connectiouns\n");
 		EmptyQueue();	# Fail pending transactions with con_lost.
 		CloseAllLondConnections(); # Should all be closed but....
 	    }
 	} else {
+	    $LondConnecting = 0;
 	    ShowStatus(GetServerHost()." >>> DEAD!!! <<<");
 	    Debug(5,"Work in queue, but gave up on connections..flushing\n");
 	    EmptyQueue();	# Connections can't be established.
@@ -797,6 +797,11 @@ sub LondReadable {
 	    "Lond connection lost.");
 	if(exists($ActiveTransactions{$Socket})) {
 	    FailTransaction($ActiveTransactions{$Socket});
+	} else {
+	    #  Socket is connecting and failed... need to mark
+	    #  no longer connecting.
+	   
+	    $LondConnecting = 0;
 	}
 	$Watcher->cancel();
 	KillSocket($Socket);
@@ -871,6 +876,10 @@ sub LondReadable {
 		.$RemoteHost." now ready for action");
 	}
 	ServerToIdle($Socket);	# Next work unit or idle.
+
+	#
+	$LondConnecting = 0;	# Best spot I can think of for this.
+	# 
 	
     } elsif ($State eq "SendingRequest") {
 	#  We need to be writable for this and probably don't belong
@@ -984,6 +993,10 @@ sub LondWritable {
 	    " has been disconnected");
 	if(exists($ActiveTransactions{$Socket})) {
 	    FailTransaction($ActiveTransactions{$Socket});
+	} else {
+	    #  In the process of conneting, so need to turn that off.
+	    
+	    $LondConnecting = 0;
 	}
 	$Watcher->cancel();
 	KillSocket($Socket);
@@ -1154,6 +1167,7 @@ sub MakeLondConnection {
 	}
 	Log("SUCESS", "Created connection ".$ConnectionCount
 	    ." to host ".GetServerHost());
+	$LondConnecting = 1;	# Connection in progress.
 	return 1;		# Return success.
     }
     
@@ -1237,15 +1251,18 @@ sub QueueTransaction {
     if(!defined $LondSocket) {	# Need to queue request.
 	Debug(5,"Must queue...");
 	$WorkQueue->enqueue($requestData);
-	if($ConnectionCount < $MaxConnectionCount) {
+	Debug(5, "Queue Transaction startnew $ConnectionCount $LondConnecting");
+	if(($ConnectionCount < $MaxConnectionCount)   && (! $LondConnecting)) {
+
 	    if($ConnectionRetriesLeft > 0) {
 		Debug(5,"Starting additional lond connection");
-		if(MakeLondConnection() == 0) {
+		if(&MakeLondConnection() == 0) {
 		    EmptyQueue();	# Fail transactions, can't make connection.
 		    CloseAllLondConnections; # Should all be closed but...
 		}
 	    } else {
 		ShowStatus(GetServerHost()." >>> DEAD !!!! <<<");
+		$LondConnecting = 0;
 		EmptyQueue();	# It's worse than that ... he's dead Jim.
 		CloseAllLondConnections; # Should all be closed but..
 	    }
@@ -1399,7 +1416,7 @@ sub SetupLoncListener {
     my $SocketName = GetLoncSocketPath();
     unlink($SocketName);
     unless ($socket =IO::Socket::UNIX->new(Local  => $SocketName,
-					    Listen => 10, 
+					    Listen => 250, 
 					    Type   => SOCK_STREAM)) {
 	die "Failed to create a lonc listner socket";
     }