--- loncom/cgi/clusterstatus.pl	2003/07/31 19:18:16	1.11
+++ loncom/cgi/clusterstatus.pl	2003/08/01 14:47:44	1.13
@@ -3,7 +3,7 @@ $|=1;
 # The LearningOnline Network with CAPA
 # Cluster Status
 #
-# $Id: clusterstatus.pl,v 1.11 2003/07/31 19:18:16 www Exp $
+# $Id: clusterstatus.pl,v 1.13 2003/08/01 14:47:44 www Exp $
 
 use lib '/home/httpd/lib/perl/';
 use LONCAPA::Configuration;
@@ -47,6 +47,7 @@ sub hidden {
 
 sub request {
     my ($local,$url,$cachetime)=@_;
+    $cachetime*=(0.5+rand);
     my $key=&key($local,$url);
     my $reply='';
     if ($FORM{$key.'_time'}) {
@@ -61,7 +62,7 @@ sub request {
 	    $reply='local_unknown'; 
 	} else {
 
-	    my $ua=new LWP::UserAgent(timeout => 20);
+	    my $ua=new LWP::UserAgent(timeout => 15);
     
 	    my $request=new HTTP::Request('GET',
 					  "http://".$hostname{$local}.$url);
@@ -94,7 +95,7 @@ sub connected {
 # Slowly phase this in: if not cached, only do 10 percent of the cases 
 #
     unless ($FORM{&key($local,$url)}) {
-	unless (rand>0.9) { return 'not_yet'; }
+	unless (rand>0.95) { return 'not_yet'; }
     }
 #
 # Actually do the query
@@ -482,7 +483,7 @@ foreach $local (sort keys %hostname) {
 	    print '<tr><th bgcolor="#DDDDBB">'.$local.'</th>';
 	    foreach my $remote (sort keys %hostname) {
 		if ($connectionstatus{$local.'_TO_'.$remote} eq 'not_yet') {
-		    print '<td bgcolor="#FFFFFF">&nbsp;</td>';
+		    print '<td bgcolor="#FFFFFF"><font color="#555522" size="-2">not yet tested</font></td>';
 		} elsif ($connectionstatus{$local.'_TO_'.$remote} eq 'ok') {
 		    print 
 '<td bgcolor="#BBDDBB"><font color="#225522" face="arial"><b>ok</b></td>';
@@ -509,7 +510,7 @@ foreach $local (sort keys %hostname) {
 		    print 
 '<tr><th bgcolor="#BBDDBB"><font face="arial" color="#225522" size="+1">'.$local.
 			'</font></th><td bgcolor="#DDDDBB">';
-		    &users();
+		    &users($local);
 		    print 
 	      '</td><td bgcolor="#DDDDBB"><font face="arial" color="#225522">'.
 	      $host{$local.'_users'}.'</font></td><td bgcolor="#DDDDBB"';
@@ -533,7 +534,7 @@ foreach $local (sort keys %hostname) {
 '<tr><th bgcolor="#BBDDBB"><font face="arial" color="#225522" size="+1">'.
                         $local.
 			'</font></th><td bgcolor="#DDDDBB">';
-		    &server();
+		    &server($local);
 		    print 
 	      '</td><td bgcolor="#DDDDBB"><font face="arial" color="#225522">'.
 	      $host{$local.'_load_doomed'}.'</font></td><td bgcolor="#DDDDBB"';
@@ -573,8 +574,9 @@ foreach $local (sort keys %hostname) {
 # ============================================================== Close, refresh
 print "</form><script>";
 $runtime=time-$starttime;
-if ($runtime>=$refresh) {
-    print 'document.status.submit();';
+if (($refresh-$runtime)<30) {
+    print "setTimeout('document.status.submit()',30000);\n".
+          "document.prgstat.progress.value='Will automatically refresh.'";
 } else {
     $refreshtime=int(1000*($refresh-$runtime));
     print "setTimeout('document.status.submit()',$refreshtime);\n".