--- loncom/loncron	2000/12/06 21:11:35	1.7
+++ loncom/loncron	2001/01/10 17:39:36	1.13
@@ -9,6 +9,8 @@
 #
 # 7/14,7/15,7/19,7/21,7/22,11/18,
 # 2/8 Gerd Kortemeyer
+# Dec 00 Scott Harrison
+# 12/23 Gerd Kortemeyer
 
 use IO::File;
 use IO::Socket;
@@ -43,7 +45,6 @@ ENDERROUT
 
 # ================================================================ Main Program
 
-
 # ------------------------------------------------------------ Read access.conf
 {
     my $config=IO::File->new("/etc/httpd/conf/access.conf");
@@ -56,6 +57,17 @@ ENDERROUT
     }
 }
 
+# ----------------------------- Make sure this process is running from user=www
+my $wwwid=getpwnam('www');
+if ($wwwid!=$<) {
+    print("User ID mismatch.  This program must be run as user 'www'\n") unless $noprint;
+   $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
+   $subj="LON: $perlvar{'lonHostID'} User ID mismatch";
+   system("echo 'User ID mismatch.  loncron must be run as user www.' |\
+ mailto $emailto -s '$subj' > /dev/null");
+    exit 1;
+}
+
 # ------------------------------------------------------------- Read hosts file
 {
     my $config=IO::File->new("$perlvar{'lonTabDir'}/hosts.tab");
@@ -110,7 +122,10 @@ print $fh (<<ENDHEADERS);
 <ol>
 <li><a href="#configuration">Configuration</a>
 <li><a href="#machine">Machine Information</a>
+<li><a href="#tmp">Temporary Files</a>
+<li><a href="#tokens">Session Tokens</a>
 <li><a href="#httpd">httpd</a>
+<li><a href="#lonsql">lonsql</a>
 <li><a href="#lond">lond</a>
 <li><a href="#lonc">lonc</a>
 <li><a href="#lonnet">lonnet</a>
@@ -182,6 +197,48 @@ while ($line=<DFH>) {
 close (DFH);
 print $fh "</pre>";
 &errout($fh);
+
+# --------------------------------------------------------------- clean out tmp
+print $fh '<hr><a name="tmp"><h2>Temporary Files</h2>';
+$cleaned=0;
+while ($fname=<$perlvar{'lonDaemons'}/tmp/*>) {
+                          my ($dev,$ino,$mode,$nlink,
+                              $uid,$gid,$rdev,$size,
+                              $atime,$mtime,$ctime,
+                              $blksize,$blocks)=stat($fname);
+                          $now=time;
+                          $since=$now-$mtime;
+                          if ($since>$perlvar{'lonExpire'}) {
+                              $cleaned++;
+                              unlink("$fname");
+                          }
+    
+}
+print $fh "Cleaned up ".$cleaned." files.";
+
+# ------------------------------------------------------------ clean out lonIDs
+print $fh '<hr><a name="tokens"><h2>Session Tokens</h2>';
+$cleaned=0;
+$active=0;
+while ($fname=<$perlvar{'lonIDsDir'}/*>) {
+                          my ($dev,$ino,$mode,$nlink,
+                              $uid,$gid,$rdev,$size,
+                              $atime,$mtime,$ctime,
+                              $blksize,$blocks)=stat($fname);
+                          $now=time;
+                          $since=$now-$mtime;
+                          if ($since>$perlvar{'lonExpire'}) {
+                              $cleaned++;
+                              print $fh "Unlinking $fname<br>";
+                              unlink("$fname");
+                          } else {
+                              $active++;
+                          }
+    
+}
+print $fh "<p>Cleaned up ".$cleaned." stale session token(s).";
+print $fh "<h3>$active open session(s)</h3>";
+
 # ----------------------------------------------------------------------- httpd
 
 print $fh '<hr><a name="httpd"><h2>httpd</h2><h3>Access Log</h3><pre>';
@@ -202,11 +259,13 @@ print $fh "</pre>";
 &errout($fh);
 
 
-# ------------------------------------------------------------------------ lonsql
-
+# ---------------------------------------------------------------------- lonsql
+#
+# Do not run for now
+#
 if ($perlvar{'lonRole'} eq "library" && 1==0) {
 
-    print $fh '<hr><a name="lond"><h2>lonsql</h2><h3>Log</h3><pre>';
+    print $fh '<hr><a name="lonsql"><h2>lonsql</h2><h3>Log</h3><pre>';
     
     if (-e "$perlvar{'lonDaemons'}/logs/lonsql.log"){
 	open (DFH,"tail -n100 $perlvar{'lonDaemons'}/logs/lonsql.log|");
@@ -312,7 +371,7 @@ if (-e $londfile) {
       print $fh "<h3>lond at pid $londpid responding</h3>";
       $restartflag=0;
    } else {
-      $errors++; $errors++;
+      $errors++;
       print $fh "<h3>lond at pid $londpid not responding</h3>";
       # Intelligently handle this.
       # Possibility #1: there is no process
@@ -321,14 +380,16 @@ if (-e $londfile) {
 	  unlink($londfile);
 	  $restartflag=1;
       }
-      # Possibility #2: there is a zombie process
-      # Possibility #3: there is a live process that is not responding
+      else {
+      # Possibility #2: there is a live process that is not responding
       #                 for an unknown reason
-      # Solution: kill process, remove .pid and restart
-      kill 2 => $londpid;
-      unlink($londfile);
-      $restartflag=1;
-      print $fh "<h3>Deciding to clean up stale .pid file and restart lond</h3>";
+      # Solution: kill parent and children processes, remove .pid and restart
+	  `killall -9 lond`;
+	  unlink($londfile);
+	  $restartflag=1;
+      }
+      print $fh 
+	  "<h3>Deciding to clean up stale .pid file and restart lond</h3>";
    }
 } 
 if ($restartflag==1) {
@@ -411,7 +472,7 @@ if (-e $loncfile) {
       kill USR1 => $loncpid;
       $restartflag=0;
    } else {
-      $errors++; $errors++;
+      $errors++;
       print $fh "<h3>lonc at pid $loncpid not responding</h3>";
       # Intelligently handle this.
       # Possibility #1: there is no process
@@ -420,14 +481,16 @@ if (-e $loncfile) {
 	  unlink($loncfile);
 	  $restartflag=1;
       }
-      # Possibility #2: there is a zombie process
-      # Possibility #3: there is a live process that is not responding
+      else {
+      # Possibility #2: there is a live process that is not responding
       #                 for an unknown reason
-      # Solution: kill process, remove .pid and restart
-      kill 2 => $loncpid;
-      unlink($loncfile);
-      $restartflag=1;
-      print $fh "<h3>Deciding to clean up stale .pid file and restart lonc</h3>";
+      # Solution: kill parent and children processes, remove .pid and restart
+	  `killall -9 lonc`;
+	  unlink($loncfile);
+	  $restartflag=1;
+      }
+      print $fh 
+	  "<h3>Deciding to clean up stale .pid file and restart lonc</h3>";
    }
 } 
 if ($restartflag==1) {
@@ -493,7 +556,7 @@ while ($line=<DFH>) {
 };
 close (DFH);
 }
-print $fh "</pre><h3>Perm Log</h3>";
+print $fh "</pre><h3>Perm Log</h3><pre>";
 
 if (-e "$perlvar{'lonDaemons'}/logs/lonnet.perm.log") {
     open(DFH,"tail -n10 $perlvar{'lonDaemons'}/logs/lonnet.perm.log|");