Diff for /loncom/loncron between versions 1.90 and 1.95.10.1

version 1.90, 2011/06/03 20:45:10 version 1.95.10.1, 2012/02/17 22:47:39
Line 515  sub clean_sockets { Line 515  sub clean_sockets {
 # ----------------------------------------------------------------------- httpd  # ----------------------------------------------------------------------- httpd
 sub check_httpd_logs {  sub check_httpd_logs {
     my ($fh)=@_;      my ($fh)=@_;
     &log($fh,'<hr /><a name="httpd" /><h2>httpd</h2><h3>Access Log</h3><pre>');      if (open(PIPE,"./lchttpdlogs|")) {
               while (my $line=<PIPE>) {
     open (DFH,"tail -n25 /etc/httpd/logs/access_log|");              &log($fh,$line);
     while (my $line=<DFH>) { &log($fh,&encode_entities($line,'<>&"')) };              if ($line=~/\[error\]/) { $notices++; }
     close (DFH);          }
           close(PIPE);
     &log($fh,"</pre><h3>Error Log</h3><pre>");  
   
     open (DFH,"tail -n25 /etc/httpd/logs/error_log|");  
     while (my $line=<DFH>) {   
  &log($fh,"$line");  
  if ($line=~/\[error\]/) { $notices++; }   
     }      }
     close (DFH);  
     &log($fh,"</pre>");  
     &errout($fh);      &errout($fh);
 }  }
   
Line 635  sub check_delayed_msg { Line 627  sub check_delayed_msg {
     }      }
   
     &log($fh,"<p>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 > 0) {
           $warnings=$warnings+5*$unsend;
       }
   
     if ($unsend) { $simplestatus{'unsend'}=$unsend; }      if ($unsend) { $simplestatus{'unsend'}=$unsend; }
     &log($fh,"<h3>Outgoing Buffer</h3>\n<pre>");      &log($fh,"<h3>Outgoing Buffer</h3>\n<pre>");
Line 649  sub check_delayed_msg { Line 643  sub check_delayed_msg {
     }      }
     &log($fh,"</pre>\n");      &log($fh,"</pre>\n");
     close (DFH);      close (DFH);
       my %hostname = &Apache::lonnet::all_hostnames();
       my $numhosts = scalar(keys(%hostname));
 # pong to all servers that have delayed messages  # pong to all servers that have delayed messages
 # this will trigger a reverse connection, which should flush the buffers  # this will trigger a reverse connection, which should flush the buffers
     foreach my $tryserver (keys %servers) {      foreach my $tryserver (sort(keys(%servers))) {
  my $answer=&Apache::lonnet::reply("pong",$tryserver);          if ($hostname{$tryserver} || !$numhosts) {
  &log($fh,"Pong to $tryserver: $answer<br />");              my $answer;
               eval {
                   local $SIG{ ALRM } = sub { die "TIMEOUT" };
                   alarm(20);
                   $answer = &Apache::lonnet::reply("pong",$tryserver);
                   alarm(0);
               };
               if ($@ && $@ =~ m/TIMEOUT/) {
                   &log($fh,"Attempted pong to $tryserver timed out<br />");
                   print "time out while contacting: $tryserver for pong\n";
               } else {
                   &log($fh,"Pong to $tryserver: $answer<br />");
               }
           } else {
               &log($fh,"$tryserver has delayed messages, but is not part of the cluster -- skipping 'Pong'.<br />");
           }
     }      }
 }  }
   
Line 801  sub main () { Line 812  sub main () {
     undef $perlvarref;      undef $perlvarref;
     delete $perlvar{'lonReceipt'}; # remove since sensitive and not needed      delete $perlvar{'lonReceipt'}; # remove since sensitive and not needed
     delete $perlvar{'lonSqlAccess'}; # remove since sensitive and not needed      delete $perlvar{'lonSqlAccess'}; # remove since sensitive and not needed
       delete $perlvar{'reCAPTCHA_PRIVATE'}; # remove since sensitive and not needed 
       delete $perlvar{'reCAPTCHA_PUBLIC'}; # remove since sensitive and not needed
     chdir($perlvar{'lonDaemons'});      chdir($perlvar{'lonDaemons'});
 # --------------------------------------- Make sure that LON-CAPA is configured  # --------------------------------------- Make sure that LON-CAPA is configured
 # I only test for one thing here (lonHostID).  This is just a safeguard.  # I only test for one thing here (lonHostID).  This is just a safeguard.

Removed from v.1.90  
changed lines
  Added in v.1.95.10.1


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>