[BACK]Return to loncron CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom

Diff for /loncom/loncron between versions 1.90 and 1.93

version 1.90, 2011/06/03 20:45:10 version 1.93, 2011/11/03 22:32:04
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 652  sub check_delayed_msg { Line 644  sub check_delayed_msg {
 # 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 (keys %servers) {
  my $answer=&Apache::lonnet::reply("pong",$tryserver);          my $answer;
  &log($fh,"Pong to $tryserver: $answer<br />");          eval {
               local $SIG{ ALRM } = sub { die "TIMEOUT" };
               alarm(20);
               $answer = &Apache::lonnet::reply("pong",$tryserver);
               alarm(0);
           };
           if ($@ && $@ =~ m/TIMEOUT/) {
               print "time out while contacting: $tryserver for pong\n";
           } else {
               &log($fh,"Pong to $tryserver: $answer<br />");
           }
     }      }
 }  }
   
Removed from v.1.90  
changed lines
  Added in v.1.93

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