Diff for /loncom/loncron between versions 1.19 and 1.21

version 1.19, 2001/04/11 13:37:39 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
 # 02/12/2001, 04/11/2001 Scott Harrison  # 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 313  if ($perlvar{'lonRole'} eq "library") { Line 319  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;   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 {
Line 328  if ($perlvar{'lonRole'} eq "library") { Line 334  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;   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 416  if ($restartflag==1) { Line 422  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;     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 {
Line 431  if ($restartflag==1) { Line 437  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;            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 519  if ($restartflag==1) { Line 525  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;     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 {
Line 534  if ($restartflag==1) { Line 540  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;            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 674  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.19  
changed lines
  Added in v.1.21


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