[BACK]Return to loncron CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom

Diff for /loncom/loncron between versions 1.24 and 1.29

version 1.24, 2001/09/06 19:28:06 version 1.29, 2002/05/27 19:21:59
Line 13 Line 13
 # 12/23 Gerd Kortemeyer  # 12/23 Gerd Kortemeyer
 # YEAR=2001  # YEAR=2001
 # 1/10/2001, 2/12/, 2/26, 3/15, 04/11, 04/21,8/27 Scott Harrison  # 1/10/2001, 2/12/, 2/26, 3/15, 04/11, 04/21,8/27 Scott Harrison
 # 09/04,09/06 Gerd Kortemeyer  # 09/04,09/06,11/26 Gerd Kortemeyer
   # YEAR=2002
   # 5/11/2002 Scott Harrison
   
 $|=1;  $|=1;
   
   use lib '/home/httpd/lib/perl/';
   use LONCAPA::Configuration;
   
 use IO::File;  use IO::File;
 use IO::Socket;  use IO::Socket;
   
Line 50  ENDERROUT Line 55  ENDERROUT
   
 # ================================================================ Main Program  # ================================================================ Main Program
   
 # ------------------------------------------------------------ Read access.conf  # --------------------------------- Read loncapa_apache.conf and loncapa.conf
 {  my $perlvarref=LONCAPA::Configuration::read_conf('loncapa_apache.conf',
     my $config=IO::File->new("/etc/httpd/conf/access.conf");                                                   'loncapa.conf');
   %perlvar=%{$perlvarref};
     while (my $configline=<$config>) {  undef $perlvarref;
         if ($configline =~ /PerlSetVar/) {  delete $perlvar{'lonReceipt'}; # remove since sensitive and not needed
    my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);  delete $perlvar{'lonSqlAccess'}; # remove since sensitive and not needed
            $perlvar{$varname}=$varvalue;  
         }  
     }  
     delete $perlvar{'lonReceipt'}; # remove since sensitive and not needed  
     delete $perlvar{'lonSqlAccess'}; # remove since sensitive and not needed  
 }  
   
 # --------------------------------------- Make sure that LON-CAPA is configured  # --------------------------------------- Make sure that LON-CAPA is configured
 # I only test for one thing here (lonHostID).  This is just a safeguard.  # I only test for one thing here (lonHostID).  This is just a safeguard.
Line 240  if ($psproc>250) { $notices++; } Line 239  if ($psproc>250) { $notices++; }
 # --------------------------------------------------------------- clean out tmp  # --------------------------------------------------------------- clean out tmp
 print $fh '<hr><a name="tmp"><h2>Temporary Files</h2>';  print $fh '<hr><a name="tmp"><h2>Temporary Files</h2>';
 $cleaned=0;  $cleaned=0;
   $old=0;
 while ($fname=<$perlvar{'lonDaemons'}/tmp/*>) {  while ($fname=<$perlvar{'lonDaemons'}/tmp/*>) {
                           my ($dev,$ino,$mode,$nlink,                            my ($dev,$ino,$mode,$nlink,
                               $uid,$gid,$rdev,$size,                                $uid,$gid,$rdev,$size,
Line 248  while ($fname=<$perlvar{'lonDaemons'}/tm Line 248  while ($fname=<$perlvar{'lonDaemons'}/tm
                           $now=time;                            $now=time;
                           $since=$now-$mtime;                            $since=$now-$mtime;
                           if ($since>$perlvar{'lonExpire'}) {                            if ($since>$perlvar{'lonExpire'}) {
                               $cleaned++;                                $line='';
                               unlink("$fname");                                if (open(PROBE,$fname)) {
     $line=<PROBE>;
                                     close(PROBE);
         }
         unless ($line=~/^CHECKOUTTOKEN\&/) {
                                    $cleaned++;
                                    unlink("$fname");
         } else {
     if ($since>100*$perlvar{'lonExpire'}) {
                                        $cleaned++;
                                        unlink("$fname");
    } else { $old++; }
                                 }
                           }                            }
           
 }  }
 print $fh "Cleaned up ".$cleaned." files.";  print $fh "Cleaned up ".$cleaned." files (".$old." old checkout tokens).";
   
 # ------------------------------------------------------------ clean out lonIDs  # ------------------------------------------------------------ clean out lonIDs
 print $fh '<hr><a name="tokens"><h2>Session Tokens</h2>';  print $fh '<hr><a name="tokens"><h2>Session Tokens</h2>';
Line 422  if (-e $londfile) { Line 434  if (-e $londfile) {
    my $londpid=<$lfh>;     my $londpid=<$lfh>;
    chomp($londpid);     chomp($londpid);
    if (kill 0 => $londpid) {     if (kill 0 => $londpid) {
       print $fh "<h3>lond at pid $londpid responding</h3>";        print $fh "<h3>lond at pid $londpid responding, sending USR1</h3>";
         kill USR1 => $londpid;
       $restartflag=0;        $restartflag=0;
    } else {     } else {
       $errors++;        $errors++;
Removed from v.1.24  
changed lines
  Added in v.1.29

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