--- loncom/loncnew	2007/04/11 00:10:45	1.83
+++ loncom/loncnew	2007/05/01 01:04:23	1.85
@@ -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.85 2007/05/01 01:04:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -502,6 +502,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 +568,7 @@ sub ClientWritable {
 	}
     } else {
 	$Watcher->cancel();	# A delayed request...just cancel.
+	return;
     }
 }
 
@@ -2145,13 +2149,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.");
 }