--- loncom/loncron 2002/05/11 21:18:14 1.26 +++ loncom/loncron 2002/11/27 17:14:26 1.35 @@ -55,9 +55,9 @@ ENDERROUT # ================================================================ Main Program -# ------------------------------------------- Read access.conf and loncapa.conf -my $perlvarref=LONCAPA::Configuration::read_conf('access.conf','loncapa.conf'); -my %perlvar=%{$perlvarref}; +# --------------------------------- Read loncapa_apache.conf and loncapa.conf +my $perlvarref=LONCAPA::Configuration::read_conf('loncapa.conf'); +%perlvar=%{$perlvarref}; undef $perlvarref; delete $perlvar{'lonReceipt'}; # remove since sensitive and not needed delete $perlvar{'lonSqlAccess'}; # remove since sensitive and not needed @@ -92,14 +92,21 @@ if ($wwwid!=$<) { my $config=IO::File->new("$perlvar{'lonTabDir'}/hosts.tab"); while (my $configline=<$config>) { - my ($id,$domain,$role,$name,$ip)=split(/:/,$configline); - $hostname{$id}=$name; - $hostdom{$id}=$domain; - $hostrole{$id}=$role; - $hostip{$id}=$ip; - if (($role eq 'library') && ($id ne $perlvar{'lonHostID'})) { - $libserv{$id}=$name; - } + my ($id,$domain,$role,$name,$ip,$domdescr)=split(/:/,$configline); + if ($id && $domain && $role && $name && $ip) { + $hostname{$id}=$name; + $hostdom{$id}=$domain; + $hostip{$id}=$ip; + $hostrole{$id}=$role; + if ($domdescr) { $domaindescription{$domain}=$domdescr; } + if (($role eq 'library') && ($id ne $perlvar{'lonHostID'})) { + $libserv{$id}=$name; + } + } else { + if ($configline) { +# &logthis("Skipping hosts.tab line -$configline-"); + } + } } } @@ -147,6 +154,7 @@ print $fh (<lonsql
  • lond
  • lonc +
  • lonhttpd
  • lonnet
  • Connections
  • Delayed Messages @@ -159,17 +167,17 @@ print $fh (< ENDHEADERS -foreach $varname (keys %perlvar) { +foreach $varname (sort(keys(%perlvar))) { print $fh "$varname$perlvar{$varname}\n"; } print $fh "

    Hosts

    "; -foreach $id (keys %hostname) { -print $fh - ""; -print $fh "\n"; +foreach $id (sort(keys(%hostname))) { + print $fh + ""; + print $fh "\n"; } print $fh "
    $id$hostdom{$id}$hostrole{$id}$hostname{$id}$hostip{$id}
    $id$hostdom{$id}$hostrole{$id}$hostname{$id}$hostip{$id}

    Spare Hosts

      "; -foreach $id (keys %spareid) { +foreach $id (sort(keys(%spareid))) { print $fh "
    1. $id\n"; } @@ -238,6 +246,7 @@ if ($psproc>250) { $notices++; } # --------------------------------------------------------------- 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, @@ -246,12 +255,24 @@ while ($fname=<$perlvar{'lonDaemons'}/tm $now=time; $since=$now-$mtime; if ($since>$perlvar{'lonExpire'}) { - $cleaned++; - unlink("$fname"); + $line=''; + if (open(PROBE,$fname)) { + $line=; + close(PROBE); + } + unless ($line=~/^CHECKOUTTOKEN\&/) { + $cleaned++; + unlink("$fname"); + } else { + if ($since>365*$perlvar{'lonExpire'}) { + $cleaned++; + unlink("$fname"); + } else { $old++; } + } } } -print $fh "Cleaned up ".$cleaned." files."; +print $fh "Cleaned up ".$cleaned." files (".$old." old checkout tokens)."; # ------------------------------------------------------------ clean out lonIDs print $fh '

      Session Tokens

      '; @@ -338,20 +359,20 @@ if ($perlvar{'lonRole'} eq "library") { $errors++; print $fh '
      Killall lonsql: '. system('killall lonsql').' - '; - sleep 60; + sleep 2; print $fh unlink($lonsqlfile).' - '. system('killall -9 lonsql'). '
      '; print $fh "

      lonsql not running, trying to start

      "; system( "$perlvar{'lonDaemons'}/lonsql 2>>$perlvar{'lonDaemons'}/logs/lonsql_errors"); - sleep 10; + sleep 2; if (-e $lonsqlfile) { print $fh "Seems like it started ...

      "; my $lfh=IO::File->new("$lonsqlfile"); my $lonsqlpid=<$lfh>; chomp($lonsqlpid); - sleep 30; + sleep 2; if (kill 0 => $lonsqlpid) { print $fh "

      lonsql at pid $lonsqlpid responding

      "; } else { @@ -360,7 +381,7 @@ if ($perlvar{'lonRole'} eq "library") { print $fh "Give it one more try ...

      "; system( "$perlvar{'lonDaemons'}/lonsql 2>>$perlvar{'lonDaemons'}/logs/lonsql_errors"); - sleep 10; + sleep 2; } } else { print $fh "Seems like that did not work!

      "; @@ -435,19 +456,19 @@ if ($restartflag==1) { $errors++; print $fh '
      Killall lond: '. system('killall lond').' - '; - sleep 60; + sleep 2; print $fh unlink($londfile).' - '.system('killall -9 lond'). '
      '; print $fh "

      lond not running, trying to start

      "; system( "$perlvar{'lonDaemons'}/lond 2>>$perlvar{'lonDaemons'}/logs/lond_errors"); - sleep 10; + sleep 2; if (-e $londfile) { print $fh "Seems like it started ...

      "; my $lfh=IO::File->new("$londfile"); my $londpid=<$lfh>; chomp($londpid); - sleep 30; + sleep 2; if (kill 0 => $londpid) { print $fh "

      lond at pid $londpid responding

      "; } else { @@ -456,7 +477,7 @@ if ($restartflag==1) { print $fh "Give it one more try ...

      "; system( "$perlvar{'lonDaemons'}/lond 2>>$perlvar{'lonDaemons'}/logs/lond_errors"); - sleep 10; + sleep 2; } } else { print $fh "Seems like that did not work!

      "; @@ -531,19 +552,19 @@ if ($restartflag==1) { $errors++; print $fh '
      Killall lonc: '. system('killall lonc').' - '; - sleep 60; + sleep 2; print $fh unlink($loncfile).' - '.system('killall -9 lonc'). '
      '; print $fh "

      lonc not running, trying to start

      "; system( "$perlvar{'lonDaemons'}/lonc 2>>$perlvar{'lonDaemons'}/logs/lonc_errors"); - sleep 10; + sleep 2; if (-e $loncfile) { print $fh "Seems like it started ...

      "; my $lfh=IO::File->new("$loncfile"); my $loncpid=<$lfh>; chomp($loncpid); - sleep 30; + sleep 2; if (kill 0 => $loncpid) { print $fh "

      lonc at pid $loncpid responding

      "; } else { @@ -552,7 +573,7 @@ if ($restartflag==1) { print $fh "Give it one more try ...

      "; system( "$perlvar{'lonDaemons'}/lonc 2>>$perlvar{'lonDaemons'}/logs/lonc_errors"); - sleep 10; + sleep 2; } } else { print $fh "Seems like that did not work!

      "; @@ -587,6 +608,102 @@ if ($size>40000) { &errout($fh); +# -------------------------------------------------------------------- lonhttpd + +print $fh '

      lonhttpd

      Log

      ';
+print "lonhttpd\n";
+
+if (-e "$perlvar{'lonDaemons'}/logs/lonhttpd.log"){
+open (DFH,"tail -n25 $perlvar{'lonDaemons'}/logs/lonhttpd.log|");
+while ($line=) { 
+   print $fh "$line";
+   if ($line=~/INFO/) { $notices++; }
+   if ($line=~/WARNING/) { $notices++; }
+   if ($line=~/CRITICAL/) { $warnings++; }
+};
+close (DFH);
+}
+print $fh "
      "; + +my $lonhttpdfile="$perlvar{'lonDaemons'}/logs/lonhttpd.pid"; + +$restartflag=1; +if (-e $lonhttpdfile) { + my $lfh=IO::File->new("$lonhttpdfile"); + my $lonhttpdpid=<$lfh>; + chomp($lonhttpdpid); + if (kill 0 => $lonhttpdpid) { + print $fh "

      lonhttpd at pid $lonhttpdpid responding

      "; + $restartflag=0; + } else { + $errors++; + print $fh "

      lonhttpd at pid $lonhttpdpid not responding

      "; + # Solution: kill parent and children processes, remove .pid and restart + $restartflag=1; + print $fh + "

      Decided to clean up stale .pid file and restart lonhttpd

      "; + } +} +if ($restartflag==1) { + $errors++; + print $fh '
      Killall lonhttpd: '. + system('killall lonhttpd').' - '; + sleep 2; + print $fh unlink($lonhttpdfile).' - '.system('killall -9 lonhttpd'). + '
      '; + print $fh "

      lonhttpd not running, trying to start

      "; + system( + "$perlvar{'lonDaemons'}/lonhttpd 2>>$perlvar{'lonDaemons'}/logs/lonhttpd_errors"); + sleep 2; + if (-e $lonhttpdfile) { + print $fh "Seems like it started ...

      "; + my $lfh=IO::File->new("$lonhttpdfile"); + my $lonhttpdpid=<$lfh>; + chomp($lonhttpdpid); + sleep 2; + if (kill 0 => $lonhttpdpid) { + print $fh "

      lonhttpd at pid $lonhttpdpid responding

      "; + } else { + $errors++; $errors++; + print $fh "

      lonhttpd at pid $lonhttpdpid not responding

      "; + print $fh "Give it one more try ...

      "; + system( + "$perlvar{'lonDaemons'}/lonhttpd 2>>$perlvar{'lonDaemons'}/logs/lonhttpd_errors"); + sleep 2; + } + } else { + print $fh "Seems like that did not work!

      "; + $errors++; + } + if (-e "$perlvar{'lonDaemons'}/logs/lonhttpd.log") { + print $fh "

      ";
+    open (DFH,"tail -n100 $perlvar{'lonDaemons'}/logs/lonhttpd.log|");
+    while ($line=) { 
+      print $fh "$line";
+      if ($line=~/WARNING/) { $notices++; }
+      if ($line=~/CRITICAL/) { $notices++; }
+    };
+    close (DFH);
+    print $fh "
      "; + } +} + +$fname="$perlvar{'lonDaemons'}/logs/lonhttpd.log"; + + my ($dev,$ino,$mode,$nlink, + $uid,$gid,$rdev,$size, + $atime,$mtime,$ctime, + $blksize,$blocks)=stat($fname); + +if ($size>40000) { + print $fh "Rotating logs ...

      "; + rename("$fname.2","$fname.3"); + rename("$fname.1","$fname.2"); + rename("$fname","$fname.1"); +} + + +&errout($fh); # ---------------------------------------------------------------------- lonnet print $fh '

      lonnet

      Temp Log

      ';
@@ -629,7 +746,7 @@ print $fh "
      "; print $fh '

      Connections

      '; print $fh ""; -foreach $tryserver (keys %hostname) { +foreach $tryserver (sort(keys(%hostname))) { $answer=reply("pong",$tryserver); if ($answer eq "$tryserver:$perlvar{'lonHostID'}") {