--- loncom/lond	2001/12/22 21:46:02	1.62
+++ loncom/lond	2002/01/20 18:01:43	1.63
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.62 2001/12/22 21:46:02 www Exp $
+# $Id: lond,v 1.63 2002/01/20 18:01:43 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,7 +46,8 @@
 # 11/26,11/27 Gerd Kortemeyer
 # 12/20 Scott Harrison
 # 12/22 Gerd Kortemeyer
-#
+# YEAR=2002
+# 01/20/02 Gerd Kortemeyer
 ###
 
 # based on "Perl Cookbook" ISBN 1-56592-243-3
@@ -84,6 +85,10 @@ sub catchexception {
     die($error);
 }
 
+sub timeout {
+    &logthis("<font color=ref>CRITICAL: TIME OUT ".$$."</font>");
+    &catchexception('Timeout');
+}
 # -------------------------------- Set signal handlers to record abnormal exits
 
 $SIG{'QUIT'}=\&catchexception;
@@ -187,13 +192,22 @@ sub checkchildren {
     &initnewstatus();
     &logstatus();
     &logthis('Going to check on the children');
+    $docdir=$perlvar{'lonDocRoot'};
     foreach (sort keys %children) {
+        unlink("$docdir/lon-status/londchld/$_.txt");
 	sleep 1;
         unless (kill 'USR1' => $_) {
 	    &logthis ('Child '.$_.' is dead');
             &logstatus($$.' is dead');
         } 
     }
+    sleep 5;
+    foreach (sort keys %children) {
+        unless (-e "$docdir/lon-status/londchld/$_.txt") {
+	    &logthis('Child '.$_.' did not respond');
+            kill -9 => $_;
+        }
+    }
 }
 
 # --------------------------------------------------------------------- Logging
@@ -212,8 +226,16 @@ sub logthis {
 
 sub logstatus {
     my $docdir=$perlvar{'lonDocRoot'};
+    {
     my $fh=IO::File->new(">>$docdir/lon-status/londstatus.txt");
     print $fh $$."\t".$status."\t".$lastlog."\n";
+    $fh->close();
+    }
+    {
+	my $fh=IO::File->new(">$docdir/lon-status/londchld/$$.txt");
+        print $fh $status."\n".$lastlog."\n".time;
+        $fh->close();
+    }
 }
 
 sub initnewstatus {
@@ -431,6 +453,7 @@ sub make_new_child {
         # Child can *not* return from this subroutine.
         $SIG{INT} = 'DEFAULT';      # make SIGINT kill us as it did before
         $SIG{USR1}= \&logstatus;
+        $SIG{ALRM}= \&timeout;
         $lastlog='Forked ';
         $status='Forked';
 
@@ -499,6 +522,7 @@ sub make_new_child {
                 chomp($userinput);
                 &status('Processing '.$hostid{$clientip}.': '.$userinput);
                 my $wasenc=0;
+                alarm(120);
 # ------------------------------------------------------------ See if encrypted
 		if ($userinput =~ /^enc/) {
 		  if ($cipher) {
@@ -1335,6 +1359,7 @@ sub make_new_child {
                        print $client "unknown_cmd\n";
                    }
 # -------------------------------------------------------------------- complete
+		   alarm(0);
                    &status('Listening to '.$hostid{$clientip});
 	       }
 # --------------------------------------------- client unknown or fishy, refuse