--- loncom/loncnew	2004/09/21 10:54:43	1.56
+++ loncom/loncnew	2005/01/19 21:38:25	1.57.2.1
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # lonc maintains the connections to remote computers
 #
-# $Id: loncnew,v 1.56 2004/09/21 10:54:43 foxr Exp $
+# $Id: loncnew,v 1.57.2.1 2005/01/19 21:38:25 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,6 +61,7 @@ use LONCAPA::LondConnection;
 use LONCAPA::LondTransaction;
 use LONCAPA::Configuration;
 use LONCAPA::HashIterator;
+use Fcntl qw(:flock);
 
 
 # Read the httpd configuration file to get perl variables
@@ -106,6 +107,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 +122,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
 
@@ -296,13 +313,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:
 
 
@@ -313,6 +325,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.
@@ -331,7 +358,8 @@ 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) && (!$LondConnecting)) { 
 	if ($ConnectionRetriesLeft > 0) {
@@ -356,6 +384,7 @@ sub Tick {
 	$KeyMode = ""; 
 	$clock_watcher->cancel();
     }
+    &UpdateStatus();
 }
 
 =pod
@@ -1461,25 +1490,29 @@ sub ChildStatus {
 
     Debug(2, "Reporting child status because : ".$watcher->data);
     my $docdir = $perlvar{'lonDocRoot'};
-    my $fh = IO::File->new(">>$docdir/lon-status/loncstatus.txt");
-    print $fh $$."\t".$RemoteHost."\t".$Status."\t".
+    
+    open(LOG,">>$docdir/lon-status/loncstatus.txt");
+    flock(LOG,LOCK_EX);
+    print LOG $$."\t".$RemoteHost."\t".$Status."\t".
 	$RecentLogEntry."\n";
     #
     #  Write out information about each of the connections:
     #
     if ($DebugLevel > 2) {
-	print $fh "Active connection statuses: \n";
+	print LOG "Active connection statuses: \n";
 	my $i = 1;
 	print STDERR  "================================= Socket Status Dump:\n";
 	foreach my $item (keys %ActiveConnections) {
 	    my $Socket = $ActiveConnections{$item}->data;
 	    my $state  = $Socket->GetState();
-	    print $fh "Connection $i State: $state\n";
+	    print LOG "Connection $i State: $state\n";
 	    print STDERR "---------------------- Connection $i \n";
 	    $Socket->Dump(-1);	# Ensure it gets dumped..
 	    $i++;	
 	}
     }
+    flock(LOG,LOCK_UN);
+    close(LOG);
     $ConnectionRetriesLeft = $ConnectionRetries;
 }
 
@@ -1702,7 +1735,6 @@ sub CheckKids {
     foreach my $pid (keys %ChildHash) {
 	Debug(2, "Sending USR1 -> $pid");
 	kill 'USR1' => $pid;	# Tell Child to report status.
-	sleep 1;		# Wait so file doesn't intermix.
     }
 }