--- loncom/loncron	2011/10/28 14:26:15	1.91
+++ loncom/loncron	2012/02/17 22:47:39	1.95.10.1
@@ -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.95.10.1 2012/02/17 22:47:39 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,'<hr /><a name="httpd" /><h2>httpd</h2><h3>Access Log</h3><pre>');
-    
-    open (DFH,"tail -n25 /etc/httpd/logs/access_log|");
-    while (my $line=<DFH>) { &log($fh,&encode_entities($line,'<>&"')) };
-    close (DFH);
-	
-    &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++; } 
+    if (open(PIPE,"./lchttpdlogs|")) {
+        while (my $line=<PIPE>) {
+            &log($fh,$line);
+            if ($line=~/\[error\]/) { $notices++; }
+        }
+        close(PIPE);
     }
-    close (DFH);
-    &log($fh,"</pre>");
     &errout($fh);
 }
 
@@ -635,7 +627,9 @@ sub check_delayed_msg {
     }
 
     &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; }
     &log($fh,"<h3>Outgoing Buffer</h3>\n<pre>");
@@ -649,20 +643,27 @@ sub check_delayed_msg {
     }
     &log($fh,"</pre>\n");
     close (DFH);
+    my %hostname = &Apache::lonnet::all_hostnames();
+    my $numhosts = scalar(keys(%hostname));
 # pong to all servers that have delayed messages
 # this will trigger a reverse connection, which should flush the buffers
-    foreach my $tryserver (keys %servers) {
-        my $answer;
-        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";
+    foreach my $tryserver (sort(keys(%servers))) {
+        if ($hostname{$tryserver} || !$numhosts) {
+            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,"Pong to $tryserver: $answer<br />");
+            &log($fh,"$tryserver has delayed messages, but is not part of the cluster -- skipping 'Pong'.<br />");
         }
     }
 }
@@ -811,6 +812,8 @@ sub main () {
     undef $perlvarref;
     delete $perlvar{'lonReceipt'}; # 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'});
 # --------------------------------------- Make sure that LON-CAPA is configured
 # I only test for one thing here (lonHostID).  This is just a safeguard.