[LON-CAPA-cvs] cvs: loncom / loncron
albertel
lon-capa-cvs@mail.lon-capa.org
Tue, 11 May 2004 20:19:46 -0000
This is a MIME encoded message
--albertel1084306786
Content-Type: text/plain
albertel Tue May 11 16:19:46 2004 EDT
Modified files:
/loncom loncron
Log:
- xhtml clean
--albertel1084306786
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20040511161946.txt"
Index: loncom/loncron
diff -u loncom/loncron:1.47 loncom/loncron:1.48
--- loncom/loncron:1.47 Tue May 11 15:15:03 2004
+++ loncom/loncron Tue May 11 16:19:46 2004
@@ -2,7 +2,7 @@
# Housekeeping program, started by cron, loncontrol and loncron.pl
#
-# $Id: loncron,v 1.47 2004/05/11 19:15:03 albertel Exp $
+# $Id: loncron,v 1.48 2004/05/11 20:19:46 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -28,13 +28,14 @@
#
$|=1;
+use strict;
use lib '/home/httpd/lib/perl/';
use LONCAPA::Configuration;
use IO::File;
use IO::Socket;
-use strict;
+use HTML::Entities;
#globals
use vars qw (%perlvar %simplestatus $errors $warnings $notices $totalcount);
@@ -66,11 +67,11 @@
sub errout {
my $fh=shift;
&log($fh,(<<ENDERROUT));
- <p><table border=2 bgcolor="#CCCCCC">
+ <table border="2" bgcolor="#CCCCCC">
<tr><td>Notices</td><td>$notices</td></tr>
<tr><td>Warnings</td><td>$warnings</td></tr>
<tr><td>Errors</td><td>$errors</td></tr>
- </table><p><a href="#top">Top</a><p>
+ </table><p><a href="#top">Top</a></p>
ENDERROUT
}
@@ -84,7 +85,7 @@
system("$perlvar{'lonDaemons'}/$progname 2>>$perlvar{'lonDaemons'}/logs/${daemon}_errors");
sleep 2;
if (-e $pidfile) {
- &log($fh,"Seems like it started ...<p>");
+ &log($fh,"<p>Seems like it started ...</p>");
my $lfh=IO::File->new("$pidfile");
my $daemonpid=<$lfh>;
chomp($daemonpid);
@@ -95,7 +96,7 @@
return 0;
}
}
- &log($fh,"Seems like that did not work!<p>");
+ &log($fh,"<p>Seems like that did not work!</p>");
$errors++;
return 0;
}
@@ -103,7 +104,7 @@
sub checkon_daemon {
my ($fh,$daemon,$maxsize,$sendusr1)=@_;
- &log($fh,'<hr><a name="'.$daemon.'"><h2>'.$daemon.'</h2><h3>Log</h3><pre>');
+ &log($fh,'<hr /><a name="'.$daemon.'" /><h2>'.$daemon.'</h2><h3>Log</h3><p style="white-space: pre;"><tt>');
printf("%-10s ",$daemon);
if (-e "$perlvar{'lonDaemons'}/logs/$daemon.log"){
open (DFH,"tail -n25 $perlvar{'lonDaemons'}/logs/$daemon.log|");
@@ -115,7 +116,7 @@
};
close (DFH);
}
- &log($fh,"</pre>");
+ &log($fh,"</tt></p>");
my $pidfile="$perlvar{'lonDaemons'}/logs/$daemon.pid";
@@ -157,7 +158,7 @@
} else {
$errors++;
&log($fh,"<h3>$daemon at pid $daemonpid not responding</h3>");
- &log($fh,"Give it one more try ...<p>");
+ &log($fh,"<p>Give it one more try ...</p>");
print " ";
if (&start_daemon($fh,$daemon,$pidfile)) {
&log($fh,"<h3>$daemon at pid $daemonpid responding</h3>");
@@ -168,7 +169,7 @@
$simplestatus{$daemon}='failed';
$errors++; $errors++;
&log($fh,"<h3>$daemon at pid $daemonpid not responding</h3>");
- &log($fh,"Unable to start $daemon<p>");
+ &log($fh,"<p>Unable to start $daemon</p>");
}
}
@@ -181,7 +182,7 @@
if ($line=~/CRITICAL/) { $notices++; }
};
close (DFH);
- &log($fh,"</pre>");
+ &log($fh,"</pre></p>");
}
}
@@ -193,7 +194,7 @@
$blksize,$blocks)=stat($fname);
if ($size>$maxsize) {
- &log($fh,"Rotating logs ...<p>");
+ &log($fh,"<p>Rotating logs ...</p>");
rename("$fname.2","$fname.3");
rename("$fname.1","$fname.2");
rename("$fname","$fname.1");
@@ -205,7 +206,7 @@
# --------------------------------------------------------------------- Machine
sub log_machine_info {
my ($fh)=@_;
- &log($fh,'<hr><a name="machine"><h2>Machine Information</h2>');
+ &log($fh,'<hr /><a name="machine" /><h2>Machine Information</h2>');
&log($fh,"<h3>loadavg</h3>");
open (LOADAVGH,"/proc/loadavg");
@@ -228,7 +229,7 @@
open (DFH,"df|");
while (my $line=<DFH>) {
- &log($fh,"$line");
+ &log($fh,&encode_entities($line,'<>&"'));
@parts=split(/\s+/,$line);
my $usage=$parts[4];
$usage=~s/\W//g;
@@ -252,7 +253,7 @@
open (PSH,"ps -aux --cols 140 |");
while (my $line=<PSH>) {
- &log($fh,"$line");
+ &log($fh,&encode_entities($line,'<>&"'));
$psproc++;
}
close (PSH);
@@ -278,35 +279,36 @@
<title>LON Status Report $perlvar{'lonHostID'}</title>
</head>
<body bgcolor="#AAAAAA">
-<a name="top">
+<a name="top" />
<h1>LON Status Report $perlvar{'lonHostID'}</h1>
<h2>$date ($now)</h2>
<ol>
-<li><a href="#configuration">Configuration</a>
-<li><a href="#machine">Machine Information</a>
-<li><a href="#tmp">Temporary Files</a>
-<li><a href="#tokens">Session Tokens</a>
-<li><a href="#httpd">httpd</a>
-<li><a href="#lonsql">lonsql</a>
-<li><a href="#lond">lond</a>
-<li><a href="#lonc">lonc</a>
-<li><a href="#lonhttpd">lonhttpd</a>
-<li><a href="#lonnet">lonnet</a>
-<li><a href="#connections">Connections</a>
-<li><a href="#delayed">Delayed Messages</a>
-<li><a href="#errcount">Error Coindex.html.unt</a>
+<li><a href="#configuration">Configuration</a></li>
+<li><a href="#machine">Machine Information</a></li>
+<li><a href="#tmp">Temporary Files</a></li>
+<li><a href="#tokens">Session Tokens</a></li>
+<li><a href="#httpd">httpd</a></li>
+<li><a href="#lonsql">lonsql</a></li>
+<li><a href="#lond">lond</a></li>
+<li><a href="#lonc">lonc</a></li>
+<li><a href="#lonhttpd">lonhttpd</a></li>
+<li><a href="#lonnet">lonnet</a></li>
+<li><a href="#connections">Connections</a></li>
+<li><a href="#delayed">Delayed Messages</a></li>
+<li><a href="#errcount">Error Count</a></li>
</ol>
-<hr>
-<a name="configuration">
+<hr />
+<a name="configuration" />
<h2>Configuration</h2>
<h3>PerlVars</h3>
-<table border=2>
+<table border="2">
ENDHEADERS
foreach my $varname (sort(keys(%perlvar))) {
- &log($fh,"<tr><td>$varname</td><td>$perlvar{$varname}</td></tr>\n");
+ &log($fh,"<tr><td>$varname</td><td>".
+ &encode_entities($perlvar{$varname},'<>&"')."</td></tr>\n");
}
- &log($fh,"</table><h3>Hosts</h3><table border=2>");
+ &log($fh,"</table><h3>Hosts</h3><table border='2'>");
foreach my $id (sort(keys(%{$hostname}))) {
&log($fh,
"<tr><td>$id</td><td>".$hostdom->{$id}.
@@ -315,7 +317,7 @@
}
&log($fh,"</table><h3>Spare Hosts</h3><ol>");
foreach my $id (sort(keys(%{$spareid}))) {
- &log($fh,"<li>$id\n");
+ &log($fh,"<li>$id\n</li>");
}
&log($fh,"</ol>\n");
return $fh;
@@ -324,7 +326,7 @@
# --------------------------------------------------------------- clean out tmp
sub clean_tmp {
my ($fh)=@_;
- &log($fh,'<hr><a name="tmp"><h2>Temporary Files</h2>');
+ &log($fh,'<hr /><a name="tmp" /><h2>Temporary Files</h2>');
my $cleaned=0;
my $old=0;
while (my $fname=<$perlvar{'lonDaemons'}/tmp/*>) {
@@ -357,7 +359,7 @@
# ------------------------------------------------------------ clean out lonIDs
sub clean_lonIDs {
my ($fh)=@_;
- &log($fh,'<hr><a name="tokens"><h2>Session Tokens</h2>');
+ &log($fh,'<hr /><a name="tokens" /><h2>Session Tokens</h2>');
my $cleaned=0;
my $active=0;
while (my $fname=<$perlvar{'lonIDsDir'}/*>) {
@@ -375,7 +377,7 @@
$active++;
}
}
- &log($fh,"<p>Cleaned up ".$cleaned." stale session token(s).");
+ &log($fh,"<p>Cleaned up ".$cleaned." stale session token(s).</p>");
&log($fh,"<h3>$active open session(s)</h3>");
}
@@ -383,10 +385,10 @@
# ----------------------------------------------------------------------- httpd
sub check_httpd_logs {
my ($fh)=@_;
- &log($fh,'<hr><a name="httpd"><h2>httpd</h2><h3>Access Log</h3><pre>');
+ &log($fh,'<hr /><a name="httpd" /><h2>httpd</h2><h3>Access Log</h3><pre>');
open (DFH,"tail -n25 /etc/httpd/logs/access_log|");
- while (my $line=<DFH>) { &log($fh,"$line") };
+ while (my $line=<DFH>) { &log($fh,&encode_entities($line,'<>&"')) };
close (DFH);
&log($fh,"</pre><h3>Error Log</h3><pre>");
@@ -403,14 +405,14 @@
# ---------------------------------------------------------------------- lonnet
-sub rotate_logs {
+sub rotate_lonnet_logs {
my ($fh)=@_;
- &log($fh,'<hr><a name="lonnet"><h2>lonnet</h2><h3>Temp Log</h3><pre>');
+ &log($fh,'<hr /><a name="lonnet" /><h2>lonnet</h2><h3>Temp Log</h3><pre>');
print "checking logs\n";
if (-e "$perlvar{'lonDaemons'}/logs/lonnet.log"){
open (DFH,"tail -n50 $perlvar{'lonDaemons'}/logs/lonnet.log|");
while (my $line=<DFH>) {
- &log($fh,"$line");
+ &log($fh,&encode_entities($line,'<>&"'));
}
close (DFH);
}
@@ -419,7 +421,7 @@
if (-e "$perlvar{'lonDaemons'}/logs/lonnet.perm.log") {
open(DFH,"tail -n10 $perlvar{'lonDaemons'}/logs/lonnet.perm.log|");
while (my $line=<DFH>) {
- &log($fh,"$line");
+ &log($fh,&encode_entities($line,'<>&"'));
}
close (DFH);
} else { &log($fh,"No perm log\n") }
@@ -432,7 +434,7 @@
$blksize,$blocks)=stat($fname);
if ($size>40000) {
- &log($fh,"Rotating logs ...<p>");
+ &log($fh,"<p>Rotating logs ...</p>");
rename("$fname.2","$fname.3");
rename("$fname.1","$fname.2");
rename("$fname","$fname.1");
@@ -445,9 +447,9 @@
# ----------------------------------------------------------------- Connections
sub test_connections {
my ($fh,$hostname)=@_;
- &log($fh,'<hr><a name="connections"><h2>Connections</h2>');
+ &log($fh,'<hr /><a name="connections" /><h2>Connections</h2>');
print "testing connections\n";
- &log($fh,"<table border=2>");
+ &log($fh,"<table border='2'>");
foreach my $tryserver (sort(keys(%{$hostname}))) {
print(".");
my $result;
@@ -471,7 +473,7 @@
# ------------------------------------------------------------ Delayed messages
sub check_delayed_msg {
my ($fh)=@_;
- &log($fh,'<hr><a name="delayed"><h2>Delayed Messages</h2>');
+ &log($fh,'<hr /><a name="delayed" /><h2>Delayed Messages</h2>');
print "checking buffers\n";
&log($fh,'<h3>Scanning Permanent Log</h3>');
@@ -490,28 +492,29 @@
if ($sdf eq 'D') { $unsend++; }
}
- &log($fh,"Total unsend messages: <b>$unsend</b><p>\n");
+ &log($fh,"<p>Total unsend messages: <b>$unsend</b></p>\n");
$warnings=$warnings+5*$unsend;
if ($unsend) { $simplestatus{'unsend'}=$unsend; }
- &log($fh,"<h3>Outgoing Buffer</h3>");
+ &log($fh,"<h3>Outgoing Buffer</h3>\n<pre>");
open (DFH,"ls -lF $perlvar{'lonSockDir'}/delayed|");
while (my $line=<DFH>) {
- &log($fh,"$line<br>");
+ &log($fh,&encode_entities($line,'<>&"'));
}
+ &log($fh,"</pre>\n");
close (DFH);
}
sub finish_logging {
my ($fh)=@_;
- &log($fh,"<a name=errcount>\n");
+ &log($fh,"<a name='errcount' />\n");
$totalcount=$notices+4*$warnings+100*$errors;
&errout($fh);
&log($fh,"<h1>Total Error Count: $totalcount</h1>");
my $now=time;
my $date=localtime($now);
- &log($fh,"<hr>$date ($now)</body></html>\n");
+ &log($fh,"<hr />$date ($now)</body></html>\n");
print "lon-status webpage updated\n";
$fh->close();
@@ -581,15 +584,12 @@
my (%hostname,%hostdom,%hostrole,%spareid);
while (my $configline=<$config>) {
+ next if ($configline =~ /^(\#|\s*$)/);
my ($id,$domain,$role,$name,$ip,$domdescr)=split(/:/,$configline);
if ($id && $domain && $role && $name && $ip) {
$hostname{$id}=$name;
$hostdom{$id}=$domain;
$hostrole{$id}=$role;
- } else {
- if ($configline) {
-# &logthis("Skipping hosts.tab line -$configline-");
- }
}
}
undef $config;
@@ -617,6 +617,7 @@
&clean_tmp($fh);
&clean_lonIDs($fh);
&check_httpd_logs($fh);
+ &rotate_lonnet_logs($fh);
&checkon_daemon($fh,'lonsql',200000);
&checkon_daemon($fh,'lond',40000,1);
&checkon_daemon($fh,'lonc',40000,1);
--albertel1084306786--