--- loncom/loncron 2011/10/28 14:26:15 1.91 +++ loncom/loncron 2011/11/08 22:25:25 1.94 @@ -2,7 +2,7 @@ # Housekeeping program, started by cron, loncontrol and loncron.pl # -# $Id: loncron,v 1.91 2011/10/28 14:26:15 raeburn Exp $ +# $Id: loncron,v 1.94 2011/11/08 22:25:25 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -515,21 +515,13 @@ sub clean_sockets { # ----------------------------------------------------------------------- httpd sub check_httpd_logs { my ($fh)=@_; - &log($fh,'

httpd

Access Log

');
-    
-    open (DFH,"tail -n25 /etc/httpd/logs/access_log|");
-    while (my $line=) { &log($fh,&encode_entities($line,'<>&"')) };
-    close (DFH);
-	
-    &log($fh,"

Error Log

");
-	
-    open (DFH,"tail -n25 /etc/httpd/logs/error_log|");
-    while (my $line=) { 
-	&log($fh,"$line");
-	if ($line=~/\[error\]/) { $notices++; } 
+    if (open(PIPE,"./lchttpdlogs|")) {
+        while (my $line=) {
+            &log($fh,$line);
+            if ($line=~/\[error\]/) { $notices++; }
+        }
+        close(PIPE);
     }
-    close (DFH);
-    &log($fh,"
"); &errout($fh); } @@ -660,9 +652,9 @@ sub check_delayed_msg { alarm(0); }; if ($@ && $@ =~ m/TIMEOUT/) { - print "time out while contacting: $tryserver for pong\n"; + print "time out while contacting: $tryserver for pong\n"; } else { - &log($fh,"Pong to $tryserver: $answer
"); + &log($fh,"Pong to $tryserver: $answer
"); } } }