Diff for /loncom/loncron between versions 1.11 and 1.21

version 1.11, 2000/12/23 16:56:46 version 1.21, 2001/04/24 15:55:13
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/6/2000,12/8 Scott Harrison
 # 12/23 Gerd Kortemeyer  # 12/23 Gerd Kortemeyer
   # 1/10/2001, 2/12/, 2/26, 3/15, 04/11, 04/21 Scott Harrison
   
 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 45  ENDERROUT Line 52  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 62  ENDERROUT
            $perlvar{$varname}=$varvalue;             $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
   # 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
Line 253  print $fh "</pre>"; Line 286  print $fh "</pre>";
 #  #
 # Do not run for now  # Do not run for now
 #  #
 if ($perlvar{'lonRole'} eq "library" && 1==0) {  if ($perlvar{'lonRole'} eq "library") {
   
     print $fh '<hr><a name="lonsql"><h2>lonsql</h2><h3>Log</h3><pre>';      print $fh '<hr><a name="lonsql"><h2>lonsql</h2><h3>Log</h3><pre>';
           
Line 284  if ($perlvar{'lonRole'} eq "library" && Line 317  if ($perlvar{'lonRole'} eq "library" &&
     } else {      } else {
  $errors++;   $errors++;
  print $fh "<h3>lonsql not running, trying to start</h3>";   print $fh "<h3>lonsql not running, trying to start</h3>";
  system("$perlvar{'lonDaemons'}/lonsql");   system(
  sleep 120;   "$perlvar{'lonDaemons'}/lonsql 2>>$perlvar{'lonDaemons'}/logs/lonsql_errors");
    sleep 120 unless $qflag;
  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;      sleep 30 unless $qflag;
     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 {
  $errors++; $errors++;   $errors++; $errors++;
  print $fh "<h3>lonsql at pid $lonsqlpid not responding</h3>";   print $fh "<h3>lonsql at pid $lonsqlpid not responding</h3>";
  print $fh "Give it one more try ...<p>";   print $fh "Give it one more try ...<p>";
  system("$perlvar{'lonDaemons'}/lonsql");   system(
  sleep 120;   "$perlvar{'lonDaemons'}/lonsql 2>>$perlvar{'lonDaemons'}/logs/lonsql_errors");
    sleep 120 unless $qflag;
     }      }
  } else {   } else {
     print $fh "Seems like that did not work!<p>";      print $fh "Seems like that did not work!<p>";
Line 385  if (-e $londfile) { Line 420  if (-e $londfile) {
 if ($restartflag==1) {  if ($restartflag==1) {
    $errors++;     $errors++;
    print $fh "<h3>lond not running, trying to start</h3>";     print $fh "<h3>lond not running, trying to start</h3>";
    system("$perlvar{'lonDaemons'}/lond");     system(
    sleep 120;       "$perlvar{'lonDaemons'}/lond 2>>$perlvar{'lonDaemons'}/logs/lond_errors");
      sleep 120 unless $qflag;
    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;         sleep 30 unless $qflag;
        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 {
           $errors++; $errors++;            $errors++; $errors++;
           print $fh "<h3>lond at pid $londpid not responding</h3>";            print $fh "<h3>lond at pid $londpid not responding</h3>";
           print $fh "Give it one more try ...<p>";            print $fh "Give it one more try ...<p>";
           system("$perlvar{'lonDaemons'}/lond");    system(
           sleep 120;   "$perlvar{'lonDaemons'}/lond 2>>$perlvar{'lonDaemons'}/logs/lond_errors");
             sleep 120 unless $qflag;
        }         }
    } else {     } else {
        print $fh "Seems like that did not work!<p>";         print $fh "Seems like that did not work!<p>";
Line 486  if (-e $loncfile) { Line 523  if (-e $loncfile) {
 if ($restartflag==1) {  if ($restartflag==1) {
    $errors++;     $errors++;
    print $fh "<h3>lonc not running, trying to start</h3>";     print $fh "<h3>lonc not running, trying to start</h3>";
    system("$perlvar{'lonDaemons'}/lonc");   system(
    sleep 120;   "$perlvar{'lonDaemons'}/lonc 2>>$perlvar{'lonDaemons'}/logs/lonc_errors");
      sleep 120 unless $qflag;
    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;         sleep 30 unless $qflag;
        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 {
           $errors++; $errors++;            $errors++; $errors++;
           print $fh "<h3>lonc at pid $loncpid not responding</h3>";            print $fh "<h3>lonc at pid $loncpid not responding</h3>";
           print $fh "Give it one more try ...<p>";            print $fh "Give it one more try ...<p>";
           system("$perlvar{'lonDaemons'}/lonc");     system(
           sleep 120;   "$perlvar{'lonDaemons'}/lonc 2>>$perlvar{'lonDaemons'}/logs/lonc_errors");
             sleep 120 unless $qflag;
        }         }
    } else {     } else {
        print $fh "Seems like that did not work!<p>";         print $fh "Seems like that did not work!<p>";
Line 641  if ($totalcount>200) { Line 680  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.11  
changed lines
  Added in v.1.21


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