Diff for /loncom/loncron between versions 1.23 and 1.27

version 1.23, 2001/09/04 17:58:44 version 1.27, 2002/05/17 16:19:24
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,11/26 Gerd Kortemeyer
   # YEAR=2002
   # 5/11/2002 Scott Harrison
   
   $|=1;
   
   use lib '/home/httpd/lib/perl/';
   use LONCAPA::Configuration;
   
 use IO::File;  use IO::File;
 use IO::Socket;  use IO::Socket;
   
 my $qflag=0;  
 if (@ARGV) {  
     my $arg=shift @ARGV;  
     $qflag=1 if $arg eq 'quick';  
 }  
   
 # -------------------------------------------------- Non-critical communication  # -------------------------------------------------- Non-critical communication
 sub reply {  sub reply {
     my ($cmd,$server)=@_;      my ($cmd,$server)=@_;
Line 53  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');
   my %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 210  while ($line=<DFH>) { Line 206  while ($line=<DFH>) {
    $usage=$parts[4];     $usage=$parts[4];
    $usage=~s/\W//g;     $usage=~s/\W//g;
    if ($usage>90) {      if ($usage>90) { 
       $warnings++;         $warnings++;
         $notices++; 
    } elsif ($usage>80) {     } elsif ($usage>80) {
       $warnings++;        $warnings++;
    } elsif ($usage>60) {     } elsif ($usage>60) {
Line 220  while ($line=<DFH>) { Line 217  while ($line=<DFH>) {
 }  }
 close (DFH);  close (DFH);
 print $fh "</pre>";  print $fh "</pre>";
   
   
   print $fh "<h3>ps</h3>";
   print $fh "<pre>";
   $psproc=0;
   
   open (PSH,"ps -aux|");
   while ($line=<PSH>) { 
      print $fh "$line"; 
      $psproc++;
   }
   close (PSH);
   print $fh "</pre>";
   
   if ($psproc>200) { $notices++; }
   if ($psproc>250) { $notices++; }
   
 &errout($fh);  &errout($fh);
   
 # --------------------------------------------------------------- clean out tmp  # --------------------------------------------------------------- clean out tmp
Line 332  if ($perlvar{'lonRole'} eq "library") { Line 346  if ($perlvar{'lonRole'} eq "library") {
  print $fh "<h3>lonsql not running, trying to start</h3>";   print $fh "<h3>lonsql not running, trying to start</h3>";
  system(   system(
  "$perlvar{'lonDaemons'}/lonsql 2>>$perlvar{'lonDaemons'}/logs/lonsql_errors");   "$perlvar{'lonDaemons'}/lonsql 2>>$perlvar{'lonDaemons'}/logs/lonsql_errors");
  sleep 120 unless $qflag;   sleep 10;
  if (-e $lonsqlfile) {   if (-e $lonsqlfile) {
     print $fh "Seems like it started ...<p>";      print $fh "Seems like it started ...<p>";
     my $lfh=IO::File->new("$lonsqlfile");      my $lfh=IO::File->new("$lonsqlfile");
     my $lonsqlpid=<$lfh>;      my $lonsqlpid=<$lfh>;
     chomp($lonsqlpid);      chomp($lonsqlpid);
     sleep 30 unless $qflag;      sleep 30;
     if (kill 0 => $lonsqlpid) {      if (kill 0 => $lonsqlpid) {
  print $fh "<h3>lonsql at pid $lonsqlpid responding</h3>";   print $fh "<h3>lonsql at pid $lonsqlpid responding</h3>";
     } else {      } else {
Line 347  if ($perlvar{'lonRole'} eq "library") { Line 361  if ($perlvar{'lonRole'} eq "library") {
  print $fh "Give it one more try ...<p>";   print $fh "Give it one more try ...<p>";
  system(   system(
  "$perlvar{'lonDaemons'}/lonsql 2>>$perlvar{'lonDaemons'}/logs/lonsql_errors");   "$perlvar{'lonDaemons'}/lonsql 2>>$perlvar{'lonDaemons'}/logs/lonsql_errors");
  sleep 120 unless $qflag;   sleep 10;
     }      }
  } else {   } else {
     print $fh "Seems like that did not work!<p>";      print $fh "Seems like that did not work!<p>";
Line 407  if (-e $londfile) { Line 421  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++;
Line 427  if ($restartflag==1) { Line 442  if ($restartflag==1) {
    print $fh "<h3>lond not running, trying to start</h3>";     print $fh "<h3>lond not running, trying to start</h3>";
    system(     system(
      "$perlvar{'lonDaemons'}/lond 2>>$perlvar{'lonDaemons'}/logs/lond_errors");       "$perlvar{'lonDaemons'}/lond 2>>$perlvar{'lonDaemons'}/logs/lond_errors");
    sleep 120 unless $qflag;     sleep 10;
    if (-e $londfile) {     if (-e $londfile) {
        print $fh "Seems like it started ...<p>";         print $fh "Seems like it started ...<p>";
        my $lfh=IO::File->new("$londfile");         my $lfh=IO::File->new("$londfile");
        my $londpid=<$lfh>;         my $londpid=<$lfh>;
        chomp($londpid);         chomp($londpid);
        sleep 30 unless $qflag;         sleep 30;
        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</h3>";
        } else {         } else {
Line 442  if ($restartflag==1) { Line 457  if ($restartflag==1) {
           print $fh "Give it one more try ...<p>";            print $fh "Give it one more try ...<p>";
   system(    system(
  "$perlvar{'lonDaemons'}/lond 2>>$perlvar{'lonDaemons'}/logs/lond_errors");   "$perlvar{'lonDaemons'}/lond 2>>$perlvar{'lonDaemons'}/logs/lond_errors");
           sleep 120 unless $qflag;            sleep 10;
        }         }
    } else {     } else {
        print $fh "Seems like that did not work!<p>";         print $fh "Seems like that did not work!<p>";
Line 523  if ($restartflag==1) { Line 538  if ($restartflag==1) {
    print $fh "<h3>lonc not running, trying to start</h3>";     print $fh "<h3>lonc not running, trying to start</h3>";
  system(   system(
  "$perlvar{'lonDaemons'}/lonc 2>>$perlvar{'lonDaemons'}/logs/lonc_errors");   "$perlvar{'lonDaemons'}/lonc 2>>$perlvar{'lonDaemons'}/logs/lonc_errors");
    sleep 120 unless $qflag;     sleep 10;
    if (-e $loncfile) {     if (-e $loncfile) {
        print $fh "Seems like it started ...<p>";         print $fh "Seems like it started ...<p>";
        my $lfh=IO::File->new("$loncfile");         my $lfh=IO::File->new("$loncfile");
        my $loncpid=<$lfh>;         my $loncpid=<$lfh>;
        chomp($loncpid);         chomp($loncpid);
        sleep 30 unless $qflag;         sleep 30;
        if (kill 0 => $loncpid) {         if (kill 0 => $loncpid) {
           print $fh "<h3>lonc at pid $loncpid responding</h3>";            print $fh "<h3>lonc at pid $loncpid responding</h3>";
        } else {         } else {
Line 538  if ($restartflag==1) { Line 553  if ($restartflag==1) {
           print $fh "Give it one more try ...<p>";            print $fh "Give it one more try ...<p>";
    system(     system(
  "$perlvar{'lonDaemons'}/lonc 2>>$perlvar{'lonDaemons'}/logs/lonc_errors");   "$perlvar{'lonDaemons'}/lonc 2>>$perlvar{'lonDaemons'}/logs/lonc_errors");
           sleep 120 unless $qflag;            sleep 10;
        }         }
    } else {     } else {
        print $fh "Seems like that did not work!<p>";         print $fh "Seems like that did not work!<p>";
Line 681  if ($totalcount>200) { Line 696  if ($totalcount>200) {
    $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";     $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
    $subj="LON: $perlvar{'lonHostID'} E:$errors W:$warnings N:$notices";      $subj="LON: $perlvar{'lonHostID'} E:$errors W:$warnings N:$notices"; 
    system(     system(
  "metasend -b -t $emailto -s '$subj' -f $statusdir/index.html -m text/html")   "metasend -b -t $emailto -s '$subj' -f $statusdir/index.html -m text/html");
     unless $qflag;  
 }  }
 1;  1;
   

Removed from v.1.23  
changed lines
  Added in v.1.27


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