Diff for /loncom/loncron between versions 1.1.1.1 and 1.3

version 1.1.1.1, 1999/10/13 17:48:51 version 1.3, 2000/02/08 17:34:24
Line 7 Line 7
 # 6/1/99,6/2,6/10,6/11,6/12,6/14,6/26,6/28,6/29,6/30,  # 6/1/99,6/2,6/10,6/11,6/12,6/14,6/26,6/28,6/29,6/30,
 # 7/1,7/2,7/9,7/10,7/12 Gerd Kortemeyer)  # 7/1,7/2,7/9,7/10,7/12 Gerd Kortemeyer)
 #  #
 # 7/14,7/15,7/19,7/21,7/22 Gerd Kortemeyer  # 7/14,7/15,7/19,7/21,7/22,11/18,
   # 2/8 Gerd Kortemeyer
   
 use IO::File;  use IO::File;
 use IO::Socket;  use IO::Socket;
Line 40  sub errout { Line 41  sub errout {
 ENDERROUT  ENDERROUT
 }  }
   
 # -------------------------------------------------------------- Permanent logs  
 sub logperm {  
     my $message=shift;  
     my $execdir=$perlvar{'lonDaemons'};  
     my $now=time;  
     my $local=localtime($now);  
     my $fh=Apache::File->new(">>$execdir/logs/lonnet.perm.log");  
     print $fh "$now:$message:$local\n";  
     return 1;  
 }  
   
 # ------------------------------------------------ Try to send delayed messages  
 sub senddelayed {  
     my $fh=shift;  
     my $dfname;  
     my $path="$perlvar{'lonSockDir'}/delayed";  
     print $fh "<h3>Attempting to send delayed messages</h3>";  
     while ($dfname=<$path/*>) {  
         my $wcmd;  
         {  
          my $dfh=IO::File->new($dfname);  
          $wcmd=<$dfh>;  
         }  
         my ($server,$cmd)=split(/:/,$wcmd);  
         chomp($cmd);  
         my $answer=reply($cmd,$server);  
         if ($answer ne 'con_lost') {  
     unlink("$dfname");  
             print $fh "Send $cmd to $server: $answer<br>\n";  
             &logperm("S:$server:$cmd");  
         } else {  
             print $fh "Failed to deliver $cmd to $server<br>\n";  
             $warnings++;  
         }          
     }  
 }  
   
 # ================================================================ Main Program  # ================================================================ Main Program
   
   
Line 139  print $fh (<<ENDHEADERS); Line 103  print $fh (<<ENDHEADERS);
 <head>  <head>
 <title>LON Status Report $perlvar{'lonHostID'}</title>  <title>LON Status Report $perlvar{'lonHostID'}</title>
 </head>  </head>
 <body bgcolor="#FFFFFF">  <body bgcolor="#AAAAAA">
 <a name="top">  <a name="top">
 <h1>LON Status Report $perlvar{'lonHostID'}</h1>  <h1>LON Status Report $perlvar{'lonHostID'}</h1>
 <h2>$date ($now)</h2>  <h2>$date ($now)</h2>
Line 241  print $fh "</pre>"; Line 205  print $fh "</pre>";
 print $fh '<hr><a name="lond"><h2>lond</h2><h3>Log</h3><pre>';  print $fh '<hr><a name="lond"><h2>lond</h2><h3>Log</h3><pre>';
   
 if (-e "$perlvar{'lonDaemons'}/logs/lond.log"){  if (-e "$perlvar{'lonDaemons'}/logs/lond.log"){
 open (DFH,"tail -n50 $perlvar{'lonDaemons'}/logs/lond.log|");  open (DFH,"tail -n100 $perlvar{'lonDaemons'}/logs/lond.log|");
 while ($line=<DFH>) {   while ($line=<DFH>) { 
    print $fh "$line";     print $fh "$line";
    if ($line=~/giving up/) { $notices++; }     if ($line=~/INFO/) { $notices++; }
      if ($line=~/WARNING/) { $warnings++; }
      if ($line=~/CRITICAL/) { $errors++; }
 };  };
 close (DFH);  close (DFH);
 }  }
Line 286  if (-e $londfile) { Line 252  if (-e $londfile) {
        print $fh "Seems like that did not work!<p>";         print $fh "Seems like that did not work!<p>";
        $errors++;         $errors++;
    }     }
      if (-e "$perlvar{'lonDaemons'}/logs/lond.log"){
       print $fh "<p><pre>";
       open (DFH,"tail -n100 $perlvar{'lonDaemons'}/logs/lond.log|");
       while ($line=<DFH>) { 
         print $fh "$line";
         if ($line=~/INFO/) { $notices++; }
         if ($line=~/WARNING/) { $warnings++; }
         if ($line=~/CRITICAL/) { $errors++; }
       };
       close (DFH);
       print $fh "</pre>";
      }
 }  }
   
 $fname="$perlvar{'lonDaemons'}/logs/lond.log";  $fname="$perlvar{'lonDaemons'}/logs/lond.log";
Line 308  if ($size>40000) { Line 286  if ($size>40000) {
 print $fh '<hr><a name="lonc"><h2>lonc</h2><h3>Log</h3><pre>';  print $fh '<hr><a name="lonc"><h2>lonc</h2><h3>Log</h3><pre>';
   
 if (-e "$perlvar{'lonDaemons'}/logs/lonc.log"){  if (-e "$perlvar{'lonDaemons'}/logs/lonc.log"){
 open (DFH,"tail -n50 $perlvar{'lonDaemons'}/logs/lonc.log|");  open (DFH,"tail -n100 $perlvar{'lonDaemons'}/logs/lonc.log|");
 while ($line=<DFH>) {   while ($line=<DFH>) { 
    print $fh "$line";     print $fh "$line";
    if ($line=~/died/) { $notices++; }     if ($line=~/INFO/) { $notices++; }
      if ($line=~/WARNING/) { $warnings++; }
      if ($line=~/CRITICAL/) { $errors++; }
 };  };
 close (DFH);  close (DFH);
 }  }
Line 354  if (-e $loncfile) { Line 334  if (-e $loncfile) {
        print $fh "Seems like that did not work!<p>";         print $fh "Seems like that did not work!<p>";
        $errors++;         $errors++;
    }     }
      if (-e "$perlvar{'lonDaemons'}/logs/lonc.log") {
       print $fh "<p><pre>";
       open (DFH,"tail -n100 $perlvar{'lonDaemons'}/logs/lonc.log|");
       while ($line=<DFH>) { 
         print $fh "$line";
         if ($line=~/INFO/) { $notices++; }
         if ($line=~/WARNING/) { $warnings++; }
         if ($line=~/CRITICAL/) { $errors++; }
       };
       close (DFH);
       print $fh "</pre>";
      }
 }  }
   
 $fname="$perlvar{'lonDaemons'}/logs/lonc.log";  $fname="$perlvar{'lonDaemons'}/logs/lonc.log";
Line 379  if (-e "$perlvar{'lonDaemons'}/logs/lonn Line 371  if (-e "$perlvar{'lonDaemons'}/logs/lonn
 open (DFH,"tail -n50 $perlvar{'lonDaemons'}/logs/lonnet.log|");  open (DFH,"tail -n50 $perlvar{'lonDaemons'}/logs/lonnet.log|");
 while ($line=<DFH>) {   while ($line=<DFH>) { 
     print $fh "$line";      print $fh "$line";
     if ($line=~/Delayed/) { $warnings++; }  
     if ($line=~/giving up/) { $warnings++; }  
     if ($line=~/FAILED/) { $errors++; }  
 };  };
 close (DFH);  close (DFH);
 }  }
Line 436  print $fh "</table>"; Line 425  print $fh "</table>";
   
 print $fh '<hr><a name="delayed"><h2>Delayed Messages</h2>';  print $fh '<hr><a name="delayed"><h2>Delayed Messages</h2>';
   
 &senddelayed($fh);  
   
 print $fh '<h3>Scanning Permanent Log</h3>';  print $fh '<h3>Scanning Permanent Log</h3>';
   
 $unsend=0;  $unsend=0;

Removed from v.1.1.1.1  
changed lines
  Added in v.1.3


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