--- loncom/loncron	1999/10/13 17:48:51	1.1.1.1
+++ loncom/loncron	2000/02/08 17:54:11	1.4
@@ -7,7 +7,8 @@
 # 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/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::Socket;
@@ -40,43 +41,6 @@ sub errout {
 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
 
 
@@ -139,7 +103,7 @@ print $fh (<<ENDHEADERS);
 <head>
 <title>LON Status Report $perlvar{'lonHostID'}</title>
 </head>
-<body bgcolor="#FFFFFF">
+<body bgcolor="#AAAAAA">
 <a name="top">
 <h1>LON Status Report $perlvar{'lonHostID'}</h1>
 <h2>$date ($now)</h2>
@@ -189,7 +153,7 @@ close (LOADAVGH);
 print $fh "<tt>$loadavg</tt>";
 
 @parts=split(/\s+/,$loadavg);
-if ($parts[1]>3.0) {
+if ($parts[1]>4.0) {
     $errors++;
 } elsif ($parts[1]>2.0) {
     $warnings++;
@@ -207,13 +171,13 @@ while ($line=<DFH>) {
    $usage=$parts[4];
    $usage=~s/\W//g;
    if ($usage>90) { 
-      $errors++; 
+      $warnings++; 
    } elsif ($usage>80) {
       $warnings++;
    } elsif ($usage>60) {
       $notices++;
    }
-   if ($usage>95) { $errors++; }
+   if ($usage>95) { $warnings++; $warnings++ }
 }
 close (DFH);
 print $fh "</pre>";
@@ -241,10 +205,12 @@ print $fh "</pre>";
 print $fh '<hr><a name="lond"><h2>lond</h2><h3>Log</h3><pre>';
 
 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>) { 
    print $fh "$line";
-   if ($line=~/giving up/) { $notices++; }
+   if ($line=~/INFO/) { $notices++; }
+   if ($line=~/WARNING/) { $notices++; }
+   if ($line=~/CRITICAL/) { $warnings++; }
 };
 close (DFH);
 }
@@ -286,6 +252,17 @@ if (-e $londfile) {
        print $fh "Seems like that did not work!<p>";
        $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=~/WARNING/) { $notices++; }
+      if ($line=~/CRITICAL/) { $notices++; }
+    };
+    close (DFH);
+    print $fh "</pre>";
+   }
 }
 
 $fname="$perlvar{'lonDaemons'}/logs/lond.log";
@@ -308,10 +285,12 @@ if ($size>40000) {
 print $fh '<hr><a name="lonc"><h2>lonc</h2><h3>Log</h3><pre>';
 
 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>) { 
    print $fh "$line";
-   if ($line=~/died/) { $notices++; }
+   if ($line=~/INFO/) { $notices++; }
+   if ($line=~/WARNING/) { $notices++; }
+   if ($line=~/CRITICAL/) { $warnings++; }
 };
 close (DFH);
 }
@@ -354,6 +333,17 @@ if (-e $loncfile) {
        print $fh "Seems like that did not work!<p>";
        $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=~/WARNING/) { $notices++; }
+      if ($line=~/CRITICAL/) { $notices++; }
+    };
+    close (DFH);
+    print $fh "</pre>";
+   }
 }
 
 $fname="$perlvar{'lonDaemons'}/logs/lonc.log";
@@ -379,9 +369,6 @@ if (-e "$perlvar{'lonDaemons'}/logs/lonn
 open (DFH,"tail -n50 $perlvar{'lonDaemons'}/logs/lonnet.log|");
 while ($line=<DFH>) { 
     print $fh "$line";
-    if ($line=~/Delayed/) { $warnings++; }
-    if ($line=~/giving up/) { $warnings++; }
-    if ($line=~/FAILED/) { $errors++; }
 };
 close (DFH);
 }
@@ -436,8 +423,6 @@ print $fh "</table>";
 
 print $fh '<hr><a name="delayed"><h2>Delayed Messages</h2>';
 
-&senddelayed($fh);
-
 print $fh '<h3>Scanning Permanent Log</h3>';
 
 $unsend=0;
