--- loncom/loncnew	2005/01/17 20:35:14	1.66
+++ loncom/loncnew	2005/06/16 22:33:45	1.71
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # lonc maintains the connections to remote computers
 #
-# $Id: loncnew,v 1.66 2005/01/17 20:35:14 albertel Exp $
+# $Id: loncnew,v 1.71 2005/06/16 22:33:45 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
@@ -151,6 +152,7 @@ sub UpdateStatus {
 Makes an entry into the permanent log file.
 
 =cut
+
 sub LogPerm {
     my $message=shift;
     my $execdir=$perlvar{'lonDaemons'};
@@ -270,6 +272,7 @@ sub SocketDump {
  and as what we return in a SIGUSR1
 
 =cut
+
 sub ShowStatus {
     my $state = shift;
     my $now = time;
@@ -280,13 +283,14 @@ sub ShowStatus {
 
 =pod
 
-=head 2 SocketTimeout
+=head2 SocketTimeout
 
     Called when an action on the socket times out.  The socket is 
    destroyed and any active transaction is failed.
 
 
 =cut
+
 sub SocketTimeout {
     my $Socket = shift;
     Log("WARNING", "A socket timeout was detected");
@@ -673,9 +677,9 @@ sub FailTransaction {
 
     if ($ConnectionRetriesLeft > 0) {
 	Log("WARNING", "Failing transaction "
-	    .$transaction->getRequest());
+	    .$transaction->getLoggableRequest());
     }
-    Debug(1, "Failing transaction: ".$transaction->getRequest());
+    Debug(1, "Failing transaction: ".$transaction->getLoggableRequest());
     if (!$transaction->isDeferred()) { # If the transaction is deferred we'll get to it.
 	my $client  = $transaction->getClient();
 	Debug(1," Replying con_lost to ".$transaction->getRequest());
@@ -685,12 +689,14 @@ sub FailTransaction {
 }
 
 =pod
+
 =head1  EmptyQueue
 
   Fails all items in the work queue with con_lost.
   Note that each item in the work queue is a transaction.
 
 =cut
+
 sub EmptyQueue {
     $ConnectionRetriesLeft--;	# Counts as connection failure too.
     while($WorkQueue->Count()) {
@@ -706,6 +712,7 @@ sub EmptyQueue {
 Close all connections open on lond prior to exit e.g.
 
 =cut
+
 sub CloseAllLondConnections {
     foreach my $Socket (keys %ActiveConnections) {
       if(exists($ActiveTransactions{$Socket})) {
@@ -714,7 +721,6 @@ sub CloseAllLondConnections {
       KillSocket($Socket);
     }
 }
-=cut
 
 =pod
 
@@ -736,8 +742,8 @@ Parameters:
 
 nonzero if we are allowed to create a new connection.
 
-
 =cut
+
 sub KillSocket {
     my $Socket = shift;
 
@@ -1150,6 +1156,7 @@ sub LondWritable {
 =pod
     
 =cut
+
 sub QueueDelayed {
     Debug(3,"QueueDelayed called");
 
@@ -1558,6 +1565,7 @@ into the status file.
 
 We also use this to reset the retries count in order to allow the
 client to retry connections with a previously dead server.
+
 =cut
 
 sub ChildStatus {
@@ -1566,26 +1574,31 @@ 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;
+    UpdateStatus();
 }
 
 =pod
@@ -1606,12 +1619,14 @@ sub SignalledToDeath {
     chomp($signal);
     Log("CRITICAL", "Abnormal exit.  Child $$ for $RemoteHost "
 	."died through "."\"$signal\"");
-    LogPerm("F:lonc: $$ on $RemoteHost signalled to death: "
-	    ."\"$signal\"");
+    #LogPerm("F:lonc: $$ on $RemoteHost signalled to death: "
+#	    ."\"$signal\"");
     exit 0;
 
 }
 
+=pod
+
 =head2 ToggleDebug
 
 This sub toggles trace debugging on and off.
@@ -1627,6 +1642,8 @@ sub ToggleDebug {
 
 }
 
+=pod
+
 =head2 ChildProcess
 
 This sub implements a child process for a single lonc daemon.
@@ -2057,7 +2074,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.
     }
 
 }
@@ -2163,6 +2179,7 @@ sub really_kill_them_all_dammit
 	unlink("$execdir/logs/lonc.pid");
     }
 }
+
 =pod
 
 =head1 Terminate