--- loncom/loncron 2003/04/07 18:19:23 1.38
+++ loncom/loncron 2003/07/30 16:49:27 1.41
@@ -131,6 +131,7 @@ $date=localtime($now);
{
my $fh=IO::File->new(">$statusdir/newstatus.html");
+my %simplestatus=();
print $fh (<<ENDHEADERS);
<html>
@@ -216,7 +217,7 @@ while ($line=<DFH>) {
} elsif ($usage>60) {
$notices++;
}
- if ($usage>95) { $warnings++; $warnings++ }
+ if ($usage>95) { $warnings++; $warnings++; $simplestatus{'diskfull'}++; }
}
close (DFH);
print $fh "</pre>";
@@ -316,8 +317,6 @@ print $fh "</pre>";
# ---------------------------------------------------------------------- lonsql
my $restartflag=1;
-if ($perlvar{'lonRole'} eq "library") {
-
print $fh '<hr><a name="lonsql"><h2>lonsql</h2><h3>Log</h3><pre>';
print "lonsql\n";
if (-e "$perlvar{'lonDaemons'}/logs/lonsql.log"){
@@ -352,6 +351,7 @@ if ($perlvar{'lonRole'} eq "library") {
}
}
if ($restartflag==1) {
+ $simplestatus{'lonsql'}='off';
$errors++;
print $fh '<br><font color="red">Killall lonsql: '.
system('killall lonsql').' - ';
@@ -371,6 +371,7 @@ if ($perlvar{'lonRole'} eq "library") {
sleep 2;
if (kill 0 => $lonsqlpid) {
print $fh "<h3>lonsql at pid $lonsqlpid responding</h3>";
+ $simplestatus{'lonsql'}='restarted';
} else {
$errors++; $errors++;
print $fh "<h3>lonsql at pid $lonsqlpid not responding</h3>";
@@ -411,7 +412,6 @@ if ($perlvar{'lonRole'} eq "library") {
}
&errout($fh);
-}
# ------------------------------------------------------------------------ lond
print $fh '<hr><a name="lond"><h2>lond</h2><h3>Log</h3><pre>';
@@ -449,6 +449,7 @@ if (-e $londfile) {
}
}
if ($restartflag==1) {
+ $simplestatus{'lond'}='off';
$errors++;
print $fh '<br><font color="red">Killall lond: '.
system('killall lond').' - ';
@@ -467,6 +468,7 @@ if ($restartflag==1) {
sleep 2;
if (kill 0 => $londpid) {
print $fh "<h3>lond at pid $londpid responding</h3>";
+ $simplestatus{'lond'}='restarted';
} else {
$errors++; $errors++;
print $fh "<h3>lond at pid $londpid not responding</h3>";
@@ -545,6 +547,7 @@ if (-e $loncfile) {
}
}
if ($restartflag==1) {
+ $simplestatus{'lonc'}='off';
$errors++;
print $fh '<br><font color="red">Killall lonc: '.
system('killall lonc').' - ';
@@ -563,6 +566,7 @@ if ($restartflag==1) {
sleep 2;
if (kill 0 => $loncpid) {
print $fh "<h3>lonc at pid $loncpid responding</h3>";
+ $simplestatus{'lonc'}='restarted';
} else {
$errors++; $errors++;
print $fh "<h3>lonc at pid $loncpid not responding</h3>";
@@ -641,6 +645,7 @@ if (-e $lonhttpdfile) {
}
}
if ($restartflag==1) {
+ $simplestatus{'lonhttpd'}='off';
$errors++;
print $fh '<br><font color="red">Killall lonhttpd: '.
system('killall lonhttpd').' - ';
@@ -659,6 +664,7 @@ if ($restartflag==1) {
sleep 2;
if (kill 0 => $lonhttpdpid) {
print $fh "<h3>lonhttpd at pid $lonhttpdpid responding</h3>";
+ $simplestatus{'lonhttpd'}='restarted';
} else {
$errors++; $errors++;
print $fh "<h3>lonhttpd at pid $lonhttpdpid not responding</h3>";
@@ -782,6 +788,7 @@ $unsend=0;
print $fh "Total unsend messages: <b>$unsend</b><p>\n";
$warnings=$warnings+5*$unsend;
+if ($unsend) { $simplestatus{'unsend'}=$unsend; }
print $fh "<h3>Outgoing Buffer</h3>";
open (DFH,"ls -lF $perlvar{'lonSockDir'}/delayed|");
@@ -799,14 +806,26 @@ $now=time;
$date=localtime($now);
print $fh "<hr>$date ($now)</body></html>\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'}";
- if ($totalcount>600) {
+ if ($totalcount>1000) {
$emailto.=",$perlvar{'lonSysEMail'}";
}
$subj="LON: $perlvar{'lonHostID'} E:$errors W:$warnings N:$notices";