--- loncom/loncron 2003/09/10 19:13:09 1.42 +++ loncom/loncron 2004/01/09 17:43:40 1.45 @@ -51,7 +51,12 @@ ENDERROUT sub start_daemon { my ($fh,$daemon,$pidfile) = @_; - system("$perlvar{'lonDaemons'}/$daemon 2>>$perlvar{'lonDaemons'}/logs/${daemon}_errors"); + my $progname=$daemon; + if ($daemon eq 'lonc' && $ARGV[0] eq 'new') { + $progname='loncnew'; + print "new "; + } + system("$perlvar{'lonDaemons'}/$progname 2>>$perlvar{'lonDaemons'}/logs/${daemon}_errors"); sleep 2; if (-e $pidfile) { print $fh "Seems like it started ...
";
@@ -183,13 +188,13 @@ delete $perlvar{'lonSqlAccess'}; # remov
# --------------------------------------- Make sure that LON-CAPA is configured
# I only test for one thing here (lonHostID). This is just a safeguard.
if ('{[[[[lonHostID]]]]}' eq $perlvar{'lonHostID'}) {
- print("Unconfigured machine.\n");
- $emailto=$perlvar{'lonSysEMail'};
- $hostname=`/bin/hostname`;
- chop $hostname;
- $hostname=~s/[^\w\.]//g; # make sure is safe to pass through shell
- $subj="LON: Unconfigured machine $hostname";
- system("echo 'Unconfigured machine $hostname.' |\
+ print("Unconfigured machine.\n");
+ $emailto=$perlvar{'lonSysEMail'};
+ $hostname=`/bin/hostname`;
+ chop $hostname;
+ $hostname=~s/[^\w\.]//g; # make sure is safe to pass through shell
+ $subj="LON: Unconfigured machine $hostname";
+ system("echo 'Unconfigured machine $hostname.' |\
mailto $emailto -s '$subj' > /dev/null");
exit 1;
}
@@ -197,18 +202,18 @@ if ('{[[[[lonHostID]]]]}' eq $perlvar{'l
# ----------------------------- Make sure this process is running from user=www
my $wwwid=getpwnam('www');
if ($wwwid!=$<) {
- print("User ID mismatch. This program must be run as user 'www'\n");
- $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
- $subj="LON: $perlvar{'lonHostID'} User ID mismatch";
- system("echo 'User ID mismatch. loncron must be run as user www.' |\
+ print("User ID mismatch. This program must be run as user 'www'\n");
+ $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
+ $subj="LON: $perlvar{'lonHostID'} User ID mismatch";
+ system("echo 'User ID mismatch. loncron must be run as user www.' |\
mailto $emailto -s '$subj' > /dev/null");
- exit 1;
+ exit 1;
}
# ------------------------------------------------------------- Read hosts file
{
my $config=IO::File->new("$perlvar{'lonTabDir'}/hosts.tab");
-
+
while (my $configline=<$config>) {
my ($id,$domain,$role,$name,$ip,$domdescr)=split(/:/,$configline);
if ($id && $domain && $role && $name && $ip) {
@@ -231,12 +236,12 @@ if ($wwwid!=$<) {
# ------------------------------------------------------ Read spare server file
{
my $config=IO::File->new("$perlvar{'lonTabDir'}/spare.tab");
-
+
while (my $configline=<$config>) {
- chomp($configline);
- if (($configline) && ($configline ne $perlvar{'lonHostID'})) {
- $spareid{$configline}=1;
- }
+ chomp($configline);
+ if (($configline) && ($configline ne $perlvar{'lonHostID'})) {
+ $spareid{$configline}=1;
+ }
}
}
@@ -252,10 +257,10 @@ $now=time;
$date=localtime($now);
{
-my $fh=IO::File->new(">$statusdir/newstatus.html");
-my %simplestatus=();
-
-print $fh (< Cleaned up ".$cleaned." stale session token(s).";
-print $fh " Cleaned up ".$cleaned." stale session token(s).";
+ print $fh " ";
- rename("$fname.2","$fname.3");
- rename("$fname.1","$fname.2");
- rename("$fname","$fname.1");
-}
+ $fname="$perlvar{'lonDaemons'}/logs/lonnet.log";
-print $fh " ";
+ rename("$fname.2","$fname.3");
+ rename("$fname.1","$fname.2");
+ rename("$fname","$fname.1");
}
- if ($answer =~ /con_lost/) { print(" $tryserver down\n"); }
- print $fh " \n";
-$warnings=$warnings+5*$unsend;
+ print $fh "Total unsend messages: $unsend \n";
+ $warnings=$warnings+5*$unsend;
-if ($unsend) { $simplestatus{'unsend'}=$unsend; }
-print $fh " \n";
-}
-print $fh "$varname $perlvar{$varname} Hosts
";
-foreach $id (sort(keys(%hostname))) {
- print $fh
- "
\n";
-}
-print $fh "$id $hostdom{$id} $hostrole{$id} ";
- print $fh "$hostname{$id} $hostip{$id} Spare Hosts
";
-foreach $id (sort(keys(%spareid))) {
- print $fh "
\n";
+ foreach $varname (sort(keys(%perlvar))) {
+ print $fh " \n";
+ }
+ print $fh "$varname $perlvar{$varname} Hosts
";
+ foreach $id (sort(keys(%hostname))) {
+ print $fh
+ "
\n";
+ }
+ print $fh "$id $hostdom{$id} $hostrole{$id} ";
+ print $fh "$hostname{$id} $hostip{$id} Spare Hosts
";
+ foreach $id (sort(keys(%spareid))) {
+ print $fh "
\n";
# --------------------------------------------------------------------- Machine
+
+ print $fh 'Machine Information
';
+ print $fh "loadavg
";
+
+ open (LOADAVGH,"/proc/loadavg");
+ $loadavg=Machine Information
';
-print $fh "loadavg
";
-
-open (LOADAVGH,"/proc/loadavg");
-$loadavg=df
";
-print $fh "";
+ print $fh "
";
-print $fh "df
";
+ print $fh "";
-open (DFH,"df|");
-while ($line=
";
+ open (DFH,"df|");
+ while ($line=ps
";
-print $fh "";
-$psproc=0;
-
-open (PSH,"ps -aux|");
-while ($line=
";
+ print $fh "ps
";
+ print $fh "";
+ $psproc=0;
+
+ open (PSH,"ps -aux --cols 140 |");
+ while ($line=
";
-if ($psproc>200) { $notices++; }
-if ($psproc>250) { $notices++; }
+ if ($psproc>200) { $notices++; }
+ if ($psproc>250) { $notices++; }
-&errout($fh);
+ &errout($fh);
# --------------------------------------------------------------- clean out tmp
-print $fh 'Temporary Files
';
-$cleaned=0;
-$old=0;
-while ($fname=<$perlvar{'lonDaemons'}/tmp/*>) {
- my ($dev,$ino,$mode,$nlink,
- $uid,$gid,$rdev,$size,
- $atime,$mtime,$ctime,
- $blksize,$blocks)=stat($fname);
- $now=time;
- $since=$now-$mtime;
- if ($since>$perlvar{'lonExpire'}) {
- $line='';
- if (open(PROBE,$fname)) {
- $line=Temporary Files
';
+ $cleaned=0;
+ $old=0;
+ while ($fname=<$perlvar{'lonDaemons'}/tmp/*>) {
+ my ($dev,$ino,$mode,$nlink,
+ $uid,$gid,$rdev,$size,
+ $atime,$mtime,$ctime,
+ $blksize,$blocks)=stat($fname);
+ $now=time;
+ $since=$now-$mtime;
+ if ($since>$perlvar{'lonExpire'}) {
+ $line='';
+ if (open(PROBE,$fname)) {
+ $line=Session Tokens
';
-$cleaned=0;
-$active=0;
-while ($fname=<$perlvar{'lonIDsDir'}/*>) {
- my ($dev,$ino,$mode,$nlink,
- $uid,$gid,$rdev,$size,
- $atime,$mtime,$ctime,
- $blksize,$blocks)=stat($fname);
- $now=time;
- $since=$now-$mtime;
- if ($since>$perlvar{'lonExpire'}) {
- $cleaned++;
- print $fh "Unlinking $fname
";
- unlink("$fname");
- } else {
- $active++;
- }
-
-}
-print $fh "$active open session(s)
";
+ print $fh 'Session Tokens
';
+ $cleaned=0;
+ $active=0;
+ while ($fname=<$perlvar{'lonIDsDir'}/*>) {
+ my ($dev,$ino,$mode,$nlink,
+ $uid,$gid,$rdev,$size,
+ $atime,$mtime,$ctime,
+ $blksize,$blocks)=stat($fname);
+ $now=time;
+ $since=$now-$mtime;
+ if ($since>$perlvar{'lonExpire'}) {
+ $cleaned++;
+ print $fh "Unlinking $fname
";
+ unlink("$fname");
+ } else {
+ $active++;
+ }
-# ----------------------------------------------------------------------- httpd
+ }
+ print $fh "$active open session(s)
";
-print $fh 'httpd
Access Log
';
+# ----------------------------------------------------------------------- httpd
-open (DFH,"tail -n25 /etc/httpd/logs/access_log|");
-while ($line=
Error Log
";
-
-open (DFH,"tail -n25 /etc/httpd/logs/error_log|");
-while ($line=
";
-&errout($fh);
+ print $fh 'httpd
Access Log
';
+
+ open (DFH,"tail -n25 /etc/httpd/logs/access_log|");
+ while ($line=
Error Log
";
+
+ open (DFH,"tail -n25 /etc/httpd/logs/error_log|");
+ while ($line=
";
+ &errout($fh);
# ---------------------------------------------------------------------- lonsql
-&checkon_daemon($fh,'lonsql',200000);
+ &checkon_daemon($fh,'lonsql',200000);
# ------------------------------------------------------------------------ lond
-&checkon_daemon($fh,'lond',40000,1);
+ &checkon_daemon($fh,'lond',40000,1);
# ------------------------------------------------------------------------ lonc
-&checkon_daemon($fh,'lonc',40000,1);
+ &checkon_daemon($fh,'lonc',40000,1);
# -------------------------------------------------------------------- lonhttpd
-&checkon_daemon($fh,'lonhttpd',40000);
+ &checkon_daemon($fh,'lonhttpd',40000);
# ---------------------------------------------------------------------- lonnet
-print $fh 'lonnet
Temp Log
';
-print "checking logs\n";
-if (-e "$perlvar{'lonDaemons'}/logs/lonnet.log"){
-open (DFH,"tail -n50 $perlvar{'lonDaemons'}/logs/lonnet.log|");
-while ($line=
Perm Log
";
+ print $fh '
lonnet
Temp Log
';
+ print "checking logs\n";
+ if (-e "$perlvar{'lonDaemons'}/logs/lonnet.log"){
+ open (DFH,"tail -n50 $perlvar{'lonDaemons'}/logs/lonnet.log|");
+ while ($line=
Perm Log
";
+
+ if (-e "$perlvar{'lonDaemons'}/logs/lonnet.perm.log") {
+ open(DFH,"tail -n10 $perlvar{'lonDaemons'}/logs/lonnet.perm.log|");
+ while ($line=
";
-&errout($fh);
-# ----------------------------------------------------------------- Connections
+ my ($dev,$ino,$mode,$nlink,
+ $uid,$gid,$rdev,$size,
+ $atime,$mtime,$ctime,
+ $blksize,$blocks)=stat($fname);
-print $fh 'Connections
';
-print "testing connections\n";
-print $fh "";
-foreach $tryserver (sort(keys(%hostname))) {
- print(".");
- $answer=reply("pong",$tryserver);
- if ($answer eq "$tryserver:$perlvar{'lonHostID'}") {
- $result="ok";
- } else {
- $result=$answer;
- $warnings++;
- if ($answer eq 'con_lost') { $warnings++; }
+ if ($size>40000) {
+ print $fh "Rotating logs ...
";
+ print $fh "";
+ &errout($fh);
+# ----------------------------------------------------------------- Connections
+
+ print $fh ' \n";
-}
-print $fh "$tryserver $result Connections
';
+ print "testing connections\n";
+ print $fh "";
+ foreach $tryserver (sort(keys(%hostname))) {
+ print(".");
+ $answer=reply("pong",$tryserver);
+ if ($answer eq "$tryserver:$perlvar{'lonHostID'}") {
+ $result="ok";
+ } else {
+ $result=$answer;
+ $warnings++;
+ if ($answer eq 'con_lost') { $warnings++; }
+ }
+ if ($answer =~ /con_lost/) { print(" $tryserver down\n"); }
+ print $fh "
";
-&errout($fh);
+ &errout($fh);
# ------------------------------------------------------------ Delayed messages
-print $fh ' \n";
+
+ }
+ print $fh "$tryserver $result Delayed Messages
';
-print "checking buffers\n";
+ print $fh 'Delayed Messages
';
+ print "checking buffers\n";
-print $fh 'Scanning Permanent Log
';
+ print $fh 'Scanning Permanent Log
';
-$unsend=0;
-{
- my $dfh=IO::File->new("$perlvar{'lonDaemons'}/logs/lonnet.perm.log");
- while ($line=<$dfh>) {
- ($time,$sdf,$dserv,$dcmd)=split(/:/,$line);
- if ($sdf eq 'F') {
- $local=localtime($time);
- print $fh "Failed: $time, $dserv, $dcmd
";
- $warnings++;
- }
- if ($sdf eq 'S') { $unsend--; }
- if ($sdf eq 'D') { $unsend++; }
+ $unsend=0;
+ {
+ my $dfh=IO::File->new("$perlvar{'lonDaemons'}/logs/lonnet.perm.log");
+ while ($line=<$dfh>) {
+ ($time,$sdf,$dserv,$dcmd)=split(/:/,$line);
+ if ($sdf eq 'F') {
+ $local=localtime($time);
+ print $fh "Failed: $time, $dserv, $dcmd
";
+ $warnings++;
+ }
+ if ($sdf eq 'S') { $unsend--; }
+ if ($sdf eq 'D') { $unsend++; }
+ }
}
-}
-print $fh "Total unsend messages: $unsendOutgoing Buffer
";
+ if ($unsend) { $simplestatus{'unsend'}=$unsend; }
+ print $fh "Outgoing Buffer
";
-open (DFH,"ls -lF $perlvar{'lonSockDir'}/delayed|");
-while ($line=
";
-};
-close (DFH);
+ open (DFH,"ls -lF $perlvar{'lonSockDir'}/delayed|");
+ while ($line=
";
+ };
+ close (DFH);
# ------------------------------------------------------------------------- End
-print $fh "\n";
-$totalcount=$notices+4*$warnings+100*$errors;
-&errout($fh);
-print $fh "Total Error Count: $totalcount
";
-$now=time;
-$date=localtime($now);
-print $fh "
$date ($now)