[LON-CAPA-cvs] cvs: loncom / lond

foxr lon-capa-cvs@mail.lon-capa.org
Tue, 30 Sep 2003 09:44:13 -0000


foxr		Tue Sep 30 05:44:13 2003 EDT

  Modified files:              
    /loncom	lond 
  Log:
  Tested UpdateHosts ability to 
  - Remove live children for hosts that are no longer in the hosts.tab
  - Remove live children for hosts whose IPs have changed in the hosts.tab
  
  
  
Index: loncom/lond
diff -u loncom/lond:1.148 loncom/lond:1.149
--- loncom/lond:1.148	Mon Sep 29 06:09:18 2003
+++ loncom/lond	Tue Sep 30 05:44:13 2003
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.148 2003/09/29 10:09:18 foxr Exp $
+# $Id: lond,v 1.149 2003/09/30 09:44:13 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,6 +60,11 @@
 # 09/08/2003 Ron Fox:  Told lond to take care of change logging so we
 #      don't have to remember it:
 # $Log: lond,v $
+# Revision 1.149  2003/09/30 09:44:13  foxr
+# Tested UpdateHosts ability to
+# - Remove live children for hosts that are no longer in the hosts.tab
+# - Remove live children for hosts whose IPs have changed in the hosts.tab
+#
 # Revision 1.148  2003/09/29 10:09:18  foxr
 # Put in logic to reinit lond itself (except for apache reload).  I don't believe
 # this logic works correctly yet, however lond still does everything it used to doso I'll do the commit anyway.
@@ -120,7 +125,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.148 $'; #' stupid emacs
+my $VERSION='$Revision: 1.149 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid;
 my $currentdomainid;
@@ -613,7 +618,12 @@
     foreach my $child (keys %children) {
 	my $childip = $children{$child};
 	if(!$hostid{$childip}) {
+	    logthis('<font color="blue"> UpdateHosts killing child '
+		    ." $child for ip $childip </font>");
 	    kill('INT', $child);
+	} else {
+	    logthis('<font color="green"> keeping child for ip '
+		    ." $childip (pid=$child) </font>");
 	}
     }
     ReloadApache;