--- loncom/loncron 2002/11/27 17:14:26 1.35 +++ loncom/loncron 2003/07/30 16:49:27 1.41 @@ -9,13 +9,9 @@ # # 7/14,7/15,7/19,7/21,7/22,11/18, # 2/8 Gerd Kortemeyer -# 12/6/2000,12/8 Scott Harrison # 12/23 Gerd Kortemeyer # YEAR=2001 -# 1/10/2001, 2/12/, 2/26, 3/15, 04/11, 04/21,8/27 Scott Harrison # 09/04,09/06,11/26 Gerd Kortemeyer -# YEAR=2002 -# 5/11/2002 Scott Harrison $|=1; @@ -135,6 +131,7 @@ $date=localtime($now); { my $fh=IO::File->new(">$statusdir/newstatus.html"); +my %simplestatus=(); print $fh (< @@ -220,7 +217,7 @@ while ($line=) { } elsif ($usage>60) { $notices++; } - if ($usage>95) { $warnings++; $warnings++ } + if ($usage>95) { $warnings++; $warnings++; $simplestatus{'diskfull'}++; } } close (DFH); print $fh ""; @@ -320,8 +317,6 @@ print $fh ""; # ---------------------------------------------------------------------- lonsql my $restartflag=1; -if ($perlvar{'lonRole'} eq "library") { - print $fh '

lonsql

Log

';
     print "lonsql\n";
     if (-e "$perlvar{'lonDaemons'}/logs/lonsql.log"){
@@ -356,6 +351,7 @@ if ($perlvar{'lonRole'} eq "library") {
 	}
     }
     if ($restartflag==1) {
+	$simplestatus{'lonsql'}='off';
 	$errors++;
 	         print $fh '
Killall lonsql: '.
                     system('killall lonsql').' - ';
@@ -375,6 +371,7 @@ if ($perlvar{'lonRole'} eq "library") {
 	    sleep 2;
 	    if (kill 0 => $lonsqlpid) {
 		print $fh "
lonsql at pid $lonsqlpid responding
";
+		$simplestatus{'lonsql'}='restarted';
 	    } else {
 		$errors++; $errors++;
 		print $fh "
lonsql at pid $lonsqlpid not responding
";
@@ -407,7 +404,7 @@ if ($perlvar{'lonRole'} eq "library") {
 	$atime,$mtime,$ctime,
 	$blksize,$blocks)=stat($fname);
 
-    if ($size>40000) {
+    if ($size>200000) {
 	print $fh "Rotating logs ...
";
 	rename("$fname.2","$fname.3");
 	rename("$fname.1","$fname.2");
@@ -415,7 +412,6 @@ if ($perlvar{'lonRole'} eq "library") {
     }
 
     &errout($fh);
-}
 # ------------------------------------------------------------------------ lond
 
 print $fh '
lond
Log
';
@@ -453,6 +449,7 @@ if (-e $londfile) {
    }
 } 
 if ($restartflag==1) {
+    $simplestatus{'lond'}='off';
    $errors++;
 	  print $fh '
Killall lond: '.
                     system('killall lond').' - ';
@@ -471,6 +468,7 @@ if ($restartflag==1) {
        sleep 2;
        if (kill 0 => $londpid) {
           print $fh "
lond at pid $londpid responding
";
+	  $simplestatus{'lond'}='restarted';
        } else {
           $errors++; $errors++;
           print $fh "
lond at pid $londpid not responding
";
@@ -549,6 +547,7 @@ if (-e $loncfile) {
    }
 } 
 if ($restartflag==1) {
+    $simplestatus{'lonc'}='off';
    $errors++;
 	  print $fh '
Killall lonc: '.
 	            system('killall lonc').' - ';
@@ -567,6 +566,7 @@ if ($restartflag==1) {
        sleep 2;
        if (kill 0 => $loncpid) {
           print $fh "
lonc at pid $loncpid responding
";
+	  $simplestatus{'lonc'}='restarted';
        } else {
           $errors++; $errors++;
           print $fh "
lonc at pid $loncpid not responding
";
@@ -645,6 +645,7 @@ if (-e $lonhttpdfile) {
    }
 } 
 if ($restartflag==1) {
+    $simplestatus{'lonhttpd'}='off';
    $errors++;
 	  print $fh '
Killall lonhttpd: '.
 	            system('killall lonhttpd').' - ';
@@ -663,6 +664,7 @@ if ($restartflag==1) {
        sleep 2;
        if (kill 0 => $lonhttpdpid) {
           print $fh "
lonhttpd at pid $lonhttpdpid responding
";
+	  $simplestatus{'lonhttpd'}='restarted';
        } else {
           $errors++; $errors++;
           print $fh "
lonhttpd at pid $lonhttpdpid not responding
";
@@ -786,6 +788,7 @@ $unsend=0;
 print $fh "Total unsend messages: $unsend
\n";
 $warnings=$warnings+5*$unsend;
 
+if ($unsend) { $simplestatus{'unsend'}=$unsend; }
 print $fh "
Outgoing Buffer
";
 
 open (DFH,"ls -lF $perlvar{'lonSockDir'}/delayed|");
@@ -803,13 +806,28 @@ $now=time;
 $date=localtime($now);
 print $fh "
$date ($now)\n";
 print "writing done\n";
+$fh->close();
 }
+if ($errors) { $simplestatus{'errors'}=$errors; }
+if ($warnings) { $simplestatus{'warnings'}=$warnings; }
+if ($notices) { $simplestatus{'notices'}=$notices; }
+$simplestatus{'time'}=time;
 
 rename ("$statusdir/newstatus.html","$statusdir/index.html");
-
+{
+my $sfh=IO::File->new(">$statusdir/loncron_simple.txt");
+foreach (keys %simplestatus) {
+    print $sfh $_.'='.$simplestatus{$_}.'&';
+}
+print $sfh "\n";
+$sfh->close();
+}
 if ($totalcount>200) {
    print "mailing\n";
-   $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
+   $emailto="$perlvar{'lonAdmEMail'}";
+   if ($totalcount>1000) {
+      $emailto.=",$perlvar{'lonSysEMail'}";
+   }
    $subj="LON: $perlvar{'lonHostID'} E:$errors W:$warnings N:$notices"; 
    system(
  "metasend -b -t $emailto -s '$subj' -f $statusdir/index.html -m text/html");