Diff for /loncom/loncron between versions 1.11 and 1.16

version 1.11, 2000/12/23 16:56:46 version 1.16, 2001/02/12 18:53:32
Line 11 Line 11
 # 2/8 Gerd Kortemeyer  # 2/8 Gerd Kortemeyer
 # Dec 00 Scott Harrison  # Dec 00 Scott Harrison
 # 12/23 Gerd Kortemeyer  # 12/23 Gerd Kortemeyer
   # 02/12/2001 Scott Harrison
   
 use IO::File;  use IO::File;
 use IO::Socket;  use IO::Socket;
Line 45  ENDERROUT Line 46  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 58  ENDERROUT Line 58  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 284  if ($perlvar{'lonRole'} eq "library" && Line 309  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(
    "$perlvar{'lonDaemons'}/lonsql 2>>$perlvar{'lonDaemons'}/logs/lonsql_errors");
  sleep 120;   sleep 120;
  if (-e $lonsqlfile) {   if (-e $lonsqlfile) {
     print $fh "Seems like it started ...<p>";      print $fh "Seems like it started ...<p>";
Line 298  if ($perlvar{'lonRole'} eq "library" && Line 324  if ($perlvar{'lonRole'} eq "library" &&
  $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(
    "$perlvar{'lonDaemons'}/lonsql 2>>$perlvar{'lonDaemons'}/logs/lonsql_errors");
  sleep 120;   sleep 120;
     }      }
  } else {   } else {
Line 385  if (-e $londfile) { Line 412  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(
        "$perlvar{'lonDaemons'}/lond 2>>$perlvar{'lonDaemons'}/logs/lond_errors");
    sleep 120;     sleep 120;
    if (-e $londfile) {     if (-e $londfile) {
        print $fh "Seems like it started ...<p>";         print $fh "Seems like it started ...<p>";
Line 399  if ($restartflag==1) { Line 427  if ($restartflag==1) {
           $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(
    "$perlvar{'lonDaemons'}/lond 2>>$perlvar{'lonDaemons'}/logs/lond_errors");
           sleep 120;            sleep 120;
        }         }
    } else {     } else {
Line 486  if (-e $loncfile) { Line 515  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(
    "$perlvar{'lonDaemons'}/lond 2>>$perlvar{'lonDaemons'}/logs/lonc_errors");
    sleep 120;     sleep 120;
    if (-e $loncfile) {     if (-e $loncfile) {
        print $fh "Seems like it started ...<p>";         print $fh "Seems like it started ...<p>";
Line 500  if ($restartflag==1) { Line 530  if ($restartflag==1) {
           $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(
    "$perlvar{'lonDaemons'}/lond 2>>$perlvar{'lonDaemons'}/logs/lonc_errors");
           sleep 120;            sleep 120;
        }         }
    } else {     } else {

Removed from v.1.11  
changed lines
  Added in v.1.16


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