--- loncom/cgi/clusterstatus.pl	2002/02/18 23:45:23	1.1
+++ loncom/cgi/clusterstatus.pl	2003/02/25 21:56:48	1.7
@@ -5,8 +5,11 @@ $|=1;
 # (Versions
 # (Running loncron
 # 09/06/01 Gerd Kortemeyer)
-# 02/18/02 Gerd Kortemeyer)
-#
+# 02/18/02,02/19/02 Gerd Kortemeyer)
+
+use lib '/home/httpd/lib/perl/';
+use LONCAPA::Configuration;
+
 use LWP::UserAgent();
 use HTTP::Headers;
 use IO::File;
@@ -26,7 +29,7 @@ sub connected {
 
     my $response=$ua->request($request);
 
-    unless ($response->is_success) { return 'local_offline'; }
+    unless ($response->is_success) { return 'local_error'; }
 
     my $reply=$response->content;
     $reply=(split("\n",$reply))[0];
@@ -38,37 +41,94 @@ sub connected {
  
 print "Content-type: text/html\n\n".
       "<html><body bgcolor=#FFFFFF>\n";
-# ------------------------------------------------------------ Read access.conf
-{
-    my $config=IO::File->new("/etc/httpd/conf/access.conf");
-
-    while (my $configline=<$config>) {
-        if ($configline =~ /PerlSetVar/) {
-	   my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
-           $perlvar{$varname}=$varvalue;
-        }
-    }
-    delete $perlvar{'lonReceipt'}; # remove since sensitive and not needed
-    delete $perlvar{'lonSqlAccess'}; # remove since sensitive and not needed
-}
+# -------------------- Read loncapa.conf (and by default, loncapa_apache.conf).
+my $perlvarref=LONCAPA::Configuration::read_conf('loncapa.conf');
+my %perlvar=%{$perlvarref};
+undef $perlvarref; # remove since sensitive and not needed
+delete $perlvar{'lonReceipt'}; # remove since sensitive and not needed
+delete $perlvar{'lonSqlAccess'}; # remove since sensitive and not needed
 
 # ------------------------------------------------------------- Read hosts file
 {
     my $config=IO::File->new("$perlvar{'lonTabDir'}/hosts.tab");
 
+    $total=0;
     while (my $configline=<$config>) {
+       $configline=~s/#.*$//;
+       unless ($configline=~/\w/) { next; } 
        my ($id,$domain,$role,$name,$ip)=split(/:/,$configline);
        $hostname{$id}=$name;
        $hostdom{$id}=$domain;
        $hostrole{$id}=$role;
        $hostip{$id}=$ip;
+       $total++;
        if (($role eq 'library') && ($id ne $perlvar{'lonHostID'})) {
 	   $libserv{$id}=$name;
        }
     }
 }
 
-print "<h1>Cluster Status</h1>\n";
-print &connected('gerdl1','msul1');
-
+print 
+"<h1>Cluster Status</h1>";
+print "Please be patient while building cluster status ...<p>\n";
+$table='';
+
+$table.="<table border=2><tr><th rowspan=2>From (local)</th>".
+"<th colspan=$total>To (remote)</th></tr><tr>";
+foreach $remote (sort keys %hostname) {
+   $table.="<th";
+   if ($remote eq $perlvar{'lonHostID'}) {
+       $table.=" bgcolor=#CCFFBB";
+   } else {
+       if ($libserv{$remote}) { $table.=" bgcolor=#FFFF99"; }
+   }
+   $table.=
+ "><a href=http://".$hostname{$remote}."/lon-status/>$remote</a></th>";
+}
+$table.="</tr>";
+foreach $local (sort keys %hostname) {
+   print "Checking $local: ";
+   $table.="<tr><td";
+   if ($local eq $perlvar{'lonHostID'}) {
+       $table.=" bgcolor=#CCFFBB";
+   } else {
+       if ($libserv{$local}) { $table.=" bgcolor=#FFFF99"; }
+   }
+   $table.=
+ "><b><a href=http://".$hostname{$local}."/lon-status/>$local</a></b><br>".
+     $hostrole{$local}.' '.$hostdom{$local}.'<br>'.
+     "<tt><a href=http://".$hostname{$local}."/server-status/>".
+      $hostname{$local}."</a></tt><br>".
+     "<a href=http://".$hostname{$local}."/cgi-bin/loncron.pl>New Report</a>".
+     "</td>";
+   foreach $remote (sort keys %hostname) {
+       $status=&connected($local,$remote);
+       if ($status eq 'ok') {
+	   $table.="<td";
+           if ($libserv{$remote}) {
+	       if ($libserv{$local}) {
+		   $table.=" bgcolor=#FFFF44";
+               } else {
+                   $table.=" bgcolor=#FFFF99";
+               }
+           } elsif ($libserv{$local}) {
+               $table.=" bgcolor=#FFFF99";
+           }
+           $table.="><b><font color=#00FF00>OK</font></b></td>";
+           print ".";
+       } else {
+           print "X";
+           $table.="<td><b><font color=#FF0000>".$status."</font></b><br>".
+     "<a href=http://".$hostname{$local}.
+	 "/lon-status/loncstatus.txt>lonc</a>".
+    " <a href=http://".$hostname{$remote}.
+      "/lon-status/londstatus.txt>lond</a>".
+            "</td>";
+       }
+   }
+   $table.="</tr>\n";
+    print "<br>\n";
+}
+$table.="</table>";
+print $table;
 print "</body></html>";
