--- loncom/lond	2001/11/29 18:56:31	1.60
+++ loncom/lond	2002/01/20 18:28:31	1.64
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.60 2001/11/29 18:56:31 www Exp $
+# $Id: lond,v 1.64 2002/01/20 18:28:31 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,6 +35,7 @@
 # 06/29,06/30,07/14,07/15,07/17,07/20,07/25,09/18 Gerd Kortemeyer
 # 12/05 Scott Harrison
 # 12/05,12/13,12/29 Gerd Kortemeyer
+# YEAR=2001
 # Jan 01 Scott Harrison
 # 02/12 Gerd Kortemeyer
 # 03/15 Scott Harrison
@@ -43,7 +44,10 @@
 # 05/11,05/28,08/30 Gerd Kortemeyer
 # 9/30,10/22,11/13,11/15,11/16 Scott Harrison
 # 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
@@ -81,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;
@@ -184,13 +192,21 @@ sub checkchildren {
     &initnewstatus();
     &logstatus();
     &logthis('Going to check on the children');
-    map {
+    $docdir=$perlvar{'lonDocRoot'};
+    foreach (sort keys %children) {
 	sleep 1;
         unless (kill 'USR1' => $_) {
 	    &logthis ('Child '.$_.' is dead');
             &logstatus($$.' is dead');
         } 
-    } sort keys %children;
+    }
+    sleep 5;
+    foreach (sort keys %children) {
+        unless (-e "$docdir/lon-status/londchld/$_.txt") {
+	    &logthis('Child '.$_.' did not respond');
+            kill 9 => $_;
+        }
+    }
 }
 
 # --------------------------------------------------------------------- Logging
@@ -209,8 +225,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 {
@@ -219,6 +243,11 @@ sub initnewstatus {
     my $now=time;
     my $local=localtime($now);
     print $fh "LOND status $local - parent $$\n\n";
+    opendir(DIR,"$docdir/lon-status/londchld");
+    while ($filename=readdir(DIR)) {
+        unlink("$docdir/lon-status/londchld/$filename");
+    }
+    closedir(DIR);
 }
 
 # -------------------------------------------------------------- Status setting
@@ -428,6 +457,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';
 
@@ -496,6 +526,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) {
@@ -1087,15 +1118,22 @@ sub make_new_child {
                        }
 # ------------------------------------------------------------------------ dump
                    } elsif ($userinput =~ /^dump/) {
-                       my ($cmd,$udom,$uname,$namespace)
+                       my ($cmd,$udom,$uname,$namespace,$regexp)
                           =split(/:/,$userinput);
                        $namespace=~s/\//\_/g;
                        $namespace=~s/\W//g;
+                       if (defined($regexp)) {
+                          $regexp=&unescape($regexp);
+		       } else {
+                          $regexp='.';
+		       }
                        my $proname=propath($udom,$uname);
                        my $qresult='';
       if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER,0640)) {
                            foreach $key (keys %hash) {
-                               $qresult.="$key=$hash{$key}&";
+                               if (eval('$key=~/$regexp/')) {
+                                  $qresult.="$key=$hash{$key}&";
+			       }
                            }
 			   if (untie(%hash)) {
 		              $qresult=~s/\&$//;
@@ -1325,6 +1363,7 @@ sub make_new_child {
                        print $client "unknown_cmd\n";
                    }
 # -------------------------------------------------------------------- complete
+		   alarm(0);
                    &status('Listening to '.$hostid{$clientip});
 	       }
 # --------------------------------------------- client unknown or fishy, refuse
@@ -1351,6 +1390,48 @@ sub make_new_child {
     }
 }
 
+# ----------------------------------- POD (plain old documentation, CPAN style)
+
+=head1 NAME
+
+lond - "LON Daemon" Server (port "LOND" 5663)
+
+=head1 SYNOPSIS
+
+Should only be run as user=www.  Invoked by loncron.
+
+=head1 DESCRIPTION
+
+Preforker - server who forks first. Runs as a daemon. HUPs.
+Uses IDEA encryption
+
+=head1 README
+
+Not yet written.
+
+=head1 PREREQUISITES
+
+IO::Socket
+IO::File
+Apache::File
+Symbol
+POSIX
+Crypt::IDEA
+LWP::UserAgent()
+GDBM_File
+Authen::Krb4
+
+=head1 COREQUISITES
+
+=head1 OSNAMES
+
+linux
+
+=head1 SCRIPT CATEGORIES
+
+Server/Process
+
+=cut