--- loncom/loncnew	2010/06/14 13:29:27	1.89
+++ loncom/loncnew	2010/12/21 11:17:03	1.92
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # lonc maintains the connections to remote computers
 #
-# $Id: loncnew,v 1.89 2010/06/14 13:29:27 www Exp $
+# $Id: loncnew,v 1.92 2010/12/21 11:17:03 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -441,7 +441,8 @@ Trigger disconnections of idle sockets.
 
 sub SetupTimer {
     Debug(6, "SetupTimer");
-    Event->timer(interval => 1, cb => \&Tick );
+    Event->timer(interval => 1, cb => \&Tick,
+	hard => 1);
 }
 
 =pod
@@ -761,6 +762,7 @@ sub KillSocket {
 	delete ($ActiveTransactions{$Socket});
     }
     if(exists($ActiveConnections{$Socket})) {
+	$ActiveConnections{$Socket}->cancel;
 	delete($ActiveConnections{$Socket});
 	$ConnectionCount--;
 	if ($ConnectionCount < 0) { $ConnectionCount = 0; }
@@ -772,6 +774,7 @@ sub KillSocket {
 	EmptyQueue();
 	CloseAllLondConnections; # Should all already be closed but...
     }
+    UpdateStatus();
 }
 
 =pod
@@ -1206,7 +1209,7 @@ sub MakeLondConnection {
 					 &GetServerPort(),
 					 &GetHostId());
 
-    if($Connection eq undef) {	# Needs to be more robust later.
+    if($Connection eq undef) {	
 	Log("CRITICAL","Failed to make a connection with lond.");
 	$ConnectionRetriesLeft--;
 	return 0;		# Failure.
@@ -1773,6 +1776,7 @@ sub CreateChild {
     my $sigset = POSIX::SigSet->new(SIGINT);
     sigprocmask(SIG_BLOCK, $sigset);
     $RemoteHost = $host;
+    ShowStatus('Parent keeping the flock'); # Update time in status message.
     Log("CRITICAL", "Forking server for ".$host);
     my $pid          = fork;
     if($pid) {			# Parent