Diff for /loncom/loncron between versions 1.10 and 1.15

version 1.10, 2000/12/08 23:17:26 version 1.15, 2001/01/10 18:47:35
Line 9 Line 9
 #  #
 # 7/14,7/15,7/19,7/21,7/22,11/18,  # 7/14,7/15,7/19,7/21,7/22,11/18,
 # 2/8 Gerd Kortemeyer  # 2/8 Gerd Kortemeyer
   # Dec 00 Scott Harrison
   # 12/23 Gerd Kortemeyer
   
 use IO::File;  use IO::File;
 use IO::Socket;  use IO::Socket;
Line 43  ENDERROUT Line 45  ENDERROUT
   
 # ================================================================ Main Program  # ================================================================ Main Program
   
   
 # ------------------------------------------------------------ Read access.conf  # ------------------------------------------------------------ Read access.conf
 {  {
     my $config=IO::File->new("/etc/httpd/conf/access.conf");      my $config=IO::File->new("/etc/httpd/conf/access.conf");
Line 56  ENDERROUT Line 57  ENDERROUT
     }      }
 }  }
   
   # --------------------------------------- Make sure that LON-CAPA is configured
   # I only test for one thing here (lonHostID).  This is just a safeguard.
   if ('{[[[[lonHostID]]]]}' eq $perlvar{'lonHostID'}) {
      print("Unconfigured machine.\n");
      $emailto=$perlvar{'lonSysEMail'};
      $hostname=`/bin/hostname`;
      chop $hostname;
      $hostname=~s/[^\w\.]//g; # make sure is safe to pass through shell
      $subj="LON: Unconfigured machine $hostname";
      system("echo 'Unconfigured machine $hostname.' |\
    mailto $emailto -s '$subj' > /dev/null");
       exit 1;
   }
   
   # ----------------------------- 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");
      $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  # ------------------------------------------------------------- Read hosts file
 {  {
     my $config=IO::File->new("$perlvar{'lonTabDir'}/hosts.tab");      my $config=IO::File->new("$perlvar{'lonTabDir'}/hosts.tab");
Line 110  print $fh (<<ENDHEADERS); Line 136  print $fh (<<ENDHEADERS);
 <ol>  <ol>
 <li><a href="#configuration">Configuration</a>  <li><a href="#configuration">Configuration</a>
 <li><a href="#machine">Machine Information</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="#httpd">httpd</a>
   <li><a href="#lonsql">lonsql</a>
 <li><a href="#lond">lond</a>  <li><a href="#lond">lond</a>
 <li><a href="#lonc">lonc</a>  <li><a href="#lonc">lonc</a>
 <li><a href="#lonnet">lonnet</a>  <li><a href="#lonnet">lonnet</a>
Line 182  while ($line=<DFH>) { Line 211  while ($line=<DFH>) {
 close (DFH);  close (DFH);
 print $fh "</pre>";  print $fh "</pre>";
 &errout($fh);  &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  # ----------------------------------------------------------------------- httpd
   
 print $fh '<hr><a name="httpd"><h2>httpd</h2><h3>Access Log</h3><pre>';  print $fh '<hr><a name="httpd"><h2>httpd</h2><h3>Access Log</h3><pre>';
Line 202  print $fh "</pre>"; Line 273  print $fh "</pre>";
 &errout($fh);  &errout($fh);
   
   
 # ------------------------------------------------------------------------ lonsql  # ---------------------------------------------------------------------- lonsql
   #
   # Do not run for now
   #
 if ($perlvar{'lonRole'} eq "library" && 1==0) {  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"){      if (-e "$perlvar{'lonDaemons'}/logs/lonsql.log"){
  open (DFH,"tail -n100 $perlvar{'lonDaemons'}/logs/lonsql.log|");   open (DFH,"tail -n100 $perlvar{'lonDaemons'}/logs/lonsql.log|");
Line 497  while ($line=<DFH>) { Line 570  while ($line=<DFH>) {
 };  };
 close (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") {  if (-e "$perlvar{'lonDaemons'}/logs/lonnet.perm.log") {
     open(DFH,"tail -n10 $perlvar{'lonDaemons'}/logs/lonnet.perm.log|");      open(DFH,"tail -n10 $perlvar{'lonDaemons'}/logs/lonnet.perm.log|");

Removed from v.1.10  
changed lines
  Added in v.1.15


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>