--- loncom/loncnew	2007/04/11 16:20:26	1.84
+++ loncom/loncnew	2007/06/18 22:49:52	1.87
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # lonc maintains the connections to remote computers
 #
-# $Id: loncnew,v 1.84 2007/04/11 16:20:26 albertel Exp $
+# $Id: loncnew,v 1.87 2007/06/18 22:49:52 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -158,6 +158,7 @@ sub LogPerm {
     my $now=time;
     my $local=localtime($now);
     my $fh=IO::File->new(">>$execdir/logs/lonnet.perm.log");
+    chomp($message);
     print $fh "$now:$message:$local\n";
 }
 
@@ -608,8 +609,8 @@ sub CompleteTransaction {
 	StartClientReply($Transaction, $data);
     } else {			# Delete deferred transaction file.
 	Log("SUCCESS", "A delayed transaction was completed");
-	LogPerm("S:$Transaction->getClient() :".$Transaction->getRequest());
-	unlink $Transaction->getFile();
+	LogPerm("S:".$Transaction->getClient().":".$Transaction->getRequest());
+	unlink($Transaction->getFile());
     }
 }
 
@@ -1382,14 +1383,23 @@ sub ClientRequest {
     $data = $data.$thisread;	# Append new data.
     $watcher->data($data);
     if($data =~ /\n$/) {	# Request entirely read.
-	if($data eq "close_connection_exit\n") {
+	if ($data eq "close_connection_exit\n") {
 	    Log("CRITICAL",
 		"Request Close Connection ... exiting");
 	    CloseAllLondConnections();
 	    exit;
+	} elsif ($data eq "reset_retries\n") {
+	    Log("INFO", "Resetting Connection Retries.");
+	    $ConnectionRetriesLeft = $ConnectionRetries;
+	    &UpdateStatus();
+	    my $Transaction = LondTransaction->new($data);
+	    $Transaction->SetClient($socket);
+	    StartClientReply($Transaction, "ok\n");
+	    $watcher->cancel();
+	    return;
 	}
 	Debug(8, "Complete transaction received: ".$data);
-	if($LogTransactions) {
+	if ($LogTransactions) {
 	    Log("SUCCESS", "Transaction: '$data'"); # Transaction has \n.
 	}
 	my $Transaction = LondTransaction->new($data);
@@ -1897,7 +1907,7 @@ sub parent_listen {
 
 sub parent_clean_up {
     my ($loncapa_host) = @_;
-    Debug(-1, "parent_clean_up: $loncapa_host");
+    Debug(1, "parent_clean_up: $loncapa_host");
 
     my $socket_file = &GetLoncSocketPath($loncapa_host);
     unlink($socket_file);	# No problem if it doesn't exist yet [startup e.g.]
@@ -2149,13 +2159,19 @@ SIGHUP.  Responds to sigint and sigterm.
 
 sub KillThemAll {
     Debug(2, "Kill them all!!");
-    local($SIG{CHLD}) = 'IGNORE';      # Our children >will< die.
-    foreach my $pid (keys %ChildPid) {
+    
+    #local($SIG{CHLD}) = 'IGNORE';
+    # Our children >will< die.
+    # but we need to catch their death and cleanup after them in case this is 
+    # a restart set of kills
+    my @allpids = keys(%ChildPid);
+    foreach my $pid (@allpids) {
 	my $serving = $ChildPid{$pid};
 	ShowStatus("Nicely Killing lonc for $serving pid = $pid");
 	Log("CRITICAL", "Nicely Killing lonc for $serving pid = $pid");
 	kill 'QUIT' => $pid;
     }
+    ShowStatus("Finished killing child processes off.");
 }