--- loncom/loncnew	2007/04/11 00:10:45	1.83
+++ loncom/loncnew	2007/06/13 03:05:54	1.86
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # lonc maintains the connections to remote computers
 #
-# $Id: loncnew,v 1.83 2007/04/11 00:10:45 albertel Exp $
+# $Id: loncnew,v 1.86 2007/06/13 03:05:54 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";
 }
 
@@ -502,6 +503,9 @@ the data and Event->w->fd is the socket
 sub ClientWritable {
     my $Event    = shift;
     my $Watcher  = $Event->w;
+    if (!defined($Watcher)) {
+	&child_exit(-1,'No watcher for event in ClientWritable');
+    }
     my $Data     = $Watcher->data;
     my $Socket   = $Watcher->fd;
 
@@ -565,6 +569,7 @@ sub ClientWritable {
 	}
     } else {
 	$Watcher->cancel();	# A delayed request...just cancel.
+	return;
     }
 }
 
@@ -604,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());
     }
 }
 
@@ -2145,13 +2150,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.");
 }