--- loncom/cgi/clusterstatus.pl	2003/07/31 19:18:16	1.11
+++ loncom/cgi/clusterstatus.pl	2003/08/05 12:52:23	1.15
@@ -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.15 2003/08/05 12:52:23 www Exp $
 
 use lib '/home/httpd/lib/perl/';
 use LONCAPA::Configuration;
@@ -19,6 +19,7 @@ my %connectionstatus=();
 my %perlvar=();
 
 my $mode;
+my $concount=0;
 
 sub select_form {
     my ($def,$name,%hash) = @_;
@@ -47,6 +48,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 +63,7 @@ sub request {
 	    $reply='local_unknown'; 
 	} else {
 
-	    my $ua=new LWP::UserAgent(timeout => 20);
+	    my $ua=new LWP::UserAgent(timeout => 10);
     
 	    my $request=new HTTP::Request('GET',
 					  "http://".$hostname{$local}.$url);
@@ -91,10 +93,15 @@ sub connected {
     unless ($hostname{$remote}) { return 'remote_unknown'; }
     my $url='/cgi-bin/ping.pl?'.$remote;
 #
-# Slowly phase this in: if not cached, only do 10 percent of the cases 
+# Slowly phase this in: if not cached, only do 5 percent of the cases,
+# but always do the first five. 
 #
     unless ($FORM{&key($local,$url)}) {
-	unless (rand>0.9) { return 'not_yet'; }
+	unless (($concount<=5) || (rand>0.95)) { 
+	    return 'not_yet'; 
+	} else {
+	    $concount++;
+	}
     }
 #
 # Actually do the query
@@ -199,6 +206,10 @@ ENDHEADER
 	print ("<tr><td bgcolor='#DDBBBB'><font color='#552222' size='+2'>$trouble</font></td></tr>");
     }
     print "<tr><td bgcolor='#BBBBBB'>";
+# version
+    if ($host{$local.'_version'}) {
+	print "<br />Version: ".$host{$local.'_version'}
+    }
 # load
     if (($host{$local.'_load_doomed'}>0.5) || ($mode eq 'load_doomed')) {
 	print "<br />Load: ".$host{$local.'_load'}
@@ -386,6 +397,15 @@ foreach $local (sort keys %hostname) {
 	    $host{$local.'_errors'}=$loncron{'errors'};
 	}
     }
+# -- Check version
+    &statuslist($local,'Version');
+    my $version=&request($local,'/lon-status/version.txt',7200);
+    if ($version eq 'local_error') {
+	$host{$local.'_version'}='Could not determine.';
+	$host{$local.'_unresponsive_doomed'}++;
+    } else {
+	$host{$local.'_version'}=$version;
+    }
 # -- Check user status
     &statuslist($local,'Users');
     my %userstatus=&replyhash($local,'/cgi-bin/userstatus.pl?simple',600);
@@ -482,13 +502,27 @@ 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>';
+		    my $cellcolor='#FFFFFF';
+		    if ($local eq $remote) { $cellcolor='#DDDDDD'; }
+		    print '<td bgcolor="'.$cellcolor.'"><font color="#555522" size="-2">not yet tested</font></td>';
 		} elsif ($connectionstatus{$local.'_TO_'.$remote} eq 'ok') {
+		    my $cellcolor='#BBDDBB';
+		    if ($local eq $remote) { $cellcolor='#99DD99'; }
 		    print 
-'<td bgcolor="#BBDDBB"><font color="#225522" face="arial"><b>ok</b></td>';
+'<td bgcolor="'.$cellcolor.'"><font color="#225522" face="arial"><b>ok</b></td>';
 		} else {
+		    my $cellcolor='#DDBBBB';
+		    if ($connectionstatus{$local.'_TO_'.$remote} eq 'local_error') {
+			if ($local eq $remote) { 
+			    $cellcolor='#DD88AA'; 
+			} else {
+			    $cellcolor='#DDAACC';
+			}
+		    } else {
+			if ($local eq $remote) { $cellcolor='#DD9999'; }
+		    }
 		    print 
-		  '<td bgcolor="#DDBBBB"><font color="#552222" size="-2">'.
+		  '<td bgcolor="'.$cellcolor.'"><font color="#552222" size="-2">'.
 		  $connectionstatus{$local.'_TO_'.$remote}.'<br />';
 		    &lonc($local); &lond($remote);
 		    print '</td>';
@@ -509,7 +543,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 +567,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"';
@@ -549,6 +583,9 @@ foreach $local (sort keys %hostname) {
 	my $count=0;
 	foreach $local (sort keys %hostname) {
 	    my $trouble='';
+	    if ($host{$local.'_unresponsive_doomed'}>3) {
+		$trouble='Does not respond to several queries.<br />';
+	    }
 	    if ($host{$local.'_errors'}) {
 		$trouble='Has loncron errors.<br />';
 	    } elsif ($host{$local.'_loncron_doomed'}>600) {
@@ -573,8 +610,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".