--- loncom/loncnew	2004/09/20 18:40:06	1.55
+++ loncom/loncnew	2004/09/22 10:34:44	1.58
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # lonc maintains the connections to remote computers
 #
-# $Id: loncnew,v 1.55 2004/09/20 18:40:06 albertel Exp $
+# $Id: loncnew,v 1.58 2004/09/22 10:34:44 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -106,6 +106,8 @@ my $LondVersion     = "unknown"; # Versi
 my $KeyMode         = "";       # e.g. ssl, local, insecure from last connect.
 my $LondConnecting  = 0;       # True when a connection is being built.
 
+my $DieWhenIdle     = 0;	# When true children die when trimmed -> 0.
+
 #
 #   The hash below gives the HTML format for log messages
 #   given a severity.
@@ -119,6 +121,20 @@ $LogFormats{"WARNING"}  = "<font color='
 $LogFormats{"DEFAULT"}  = " %s ";
 
 
+#  UpdateStatus;
+#    Update the idle status display to show how many connections
+#    are left, retries and other stuff.
+#
+sub UpdateStatus {
+    if ($ConnectionRetriesLeft > 0) {
+	ShowStatus(GetServerHost()." Connection count: ".$ConnectionCount
+		   ." Retries remaining: ".$ConnectionRetriesLeft
+		   ." ($KeyMode)");
+    } else {
+	ShowStatus(GetServerHost()." >> DEAD <<");
+    }
+}
+
 
 =pod
 
@@ -276,6 +292,7 @@ sub SocketTimeout {
     $ConnectionRetriesLeft--;
     if($ConnectionRetriesLeft <= 0) {
 	Log("CRITICAL", "Host marked DEAD: ".GetServerHost());
+	$LondConnecting = 0;
     }
 
 }
@@ -295,13 +312,8 @@ sub Tick {
     my $clock_watcher = $Event->w;
 
     my $client;
-    if($ConnectionRetriesLeft > 0) {
-	ShowStatus(GetServerHost()." Connection count: ".$ConnectionCount
-		   ." Retries remaining: ".$ConnectionRetriesLeft
-		   ." ($KeyMode)");
-    } else {
-	ShowStatus(GetServerHost()." >> DEAD <<");
-    }
+    UpdateStatus();
+
     # Is it time to prune connection count:
 
 
@@ -312,6 +324,21 @@ sub Tick {
 	    my $Socket = $IdleConnections->pop();
 	    KillSocket($Socket);
 	    $IdleSeconds = 0;	# Otherwise all connections get trimmed to fast.
+	    UpdateStatus();
+	    if(($ConnectionCount == 0) && $DieWhenIdle) {
+		#
+		#  Create a lock file since there will be a time window
+		#  between our exit and the parent's picking up the listen
+		#  during which no listens will be done on the
+		#  lonnet client socket.
+		#
+		my $lock_file = GetLoncSocketPath().".lock";
+		open(LOCK,">$lock_file");
+		print LOCK "Contents not important";
+		close(LOCK);
+		
+		exit(0);
+	    }
 	}
     } else {
 	$IdleSeconds = 0;	# Reset idle count if not idle.
@@ -330,23 +357,21 @@ sub Tick {
     # Do we have work in the queue, but no connections to service them?
     # If so, try to make some new connections to get things going again.
     #
-    
+    #   Note this code is dead now...
+    #
     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.
@@ -799,6 +824,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);
@@ -990,6 +1020,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);
@@ -1244,15 +1278,18 @@ sub QueueTransaction {
     if(!defined $LondSocket) {	# Need to queue request.
 	Debug(5,"Must queue...");
 	$WorkQueue->enqueue($requestData);
-	if(($ConnectionCount < $MaxConnectionCount) && !$LondConnecting) {
+	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..
 	    }
@@ -1358,10 +1395,20 @@ sub NewClient {
 Returns the name of the UNIX socket on which to listen for client
 connections.
 
+=head2 Parameters:
+
+    host (optional)  - Name of the host socket to return.. defaults to
+                       the return from GetServerHost().
+
 =cut
 
 sub GetLoncSocketPath {
-    return $UnixSocketDir."/".GetServerHost();
+
+    my $host = GetServerHost();	# Default host.
+    if (@_) {
+	($host)  = @_;		# Override if supplied.
+    }
+    return $UnixSocketDir."/".$host;
 }
 
 =pod
@@ -1398,12 +1445,21 @@ connection.  The event handler establish
 (creating a communcations channel), that int turn will establish
 another event handler to subess requests.
 
+=head2  Parameters:
+
+   host (optional)   Name of the host to set up a unix socket to.
+
 =cut
 
 sub SetupLoncListener {
 
+    my $host       = GetServerHost(); # Default host.
+    if (@_) {
+	($host)    = @_		# Override host with parameter.
+    }
+
     my $socket;
-    my $SocketName = GetLoncSocketPath();
+    my $SocketName = GetLoncSocketPath($host);
     unlink($SocketName);
     unless ($socket =IO::Socket::UNIX->new(Local  => $SocketName,
 					    Listen => 250,