--- loncom/cgi/clusterstatus.pl	2003/08/13 21:41:47	1.18
+++ loncom/cgi/clusterstatus.pl	2003/09/14 18:24:34	1.22
@@ -1,9 +1,30 @@
 #!/usr/bin/perl
 $|=1;
-# The LearningOnline Network with CAPA
-# Cluster Status
+# Generates a html page showing various sataus reports about the cluster
+# $Id: clusterstatus.pl,v 1.22 2003/09/14 18:24:34 www Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
 #
-# $Id: clusterstatus.pl,v 1.18 2003/08/13 21:41:47 www Exp $
 
 use lib '/home/httpd/lib/perl/';
 use LONCAPA::Configuration;
@@ -26,6 +47,10 @@ my $fromcache;
 my %domaindescription = ();
 my %domain_auth_def = ();
 my %domain_auth_arg_def = ();
+my %domain_lang_def=();
+my %domain_city=();
+my %domain_longi=();
+my %domain_lati=();
 
 my %hostname=();
 my %hostip=();
@@ -217,6 +242,11 @@ sub announcement {
     print &otherwindow($local,'/announcement.txt','Announcement');
 }
 
+sub takeonline {
+    my $local=shift;
+    print &otherwindow($local,'/cgi-bin/takeonline.pl','Take online');
+}
+
 # ========================================================= Produce a green bar
 sub bar {
     my $parm=shift;
@@ -238,6 +268,7 @@ sub serverstatus {
 <tr><td bgcolor="#BBDDBB"><font color="#225522" face="arial"><b>
 $local $hostdom{$local}</b> <tt>($hostname{$local}; $hostrole{$local})</tt>
 <br />$domaindescription{$hostdom{$local}}
+$domain_city{$hostdom{$local}}
 </font></th></tr><tr><td bgcolor="#DDDDBB"><font color="#225522">
 ENDHEADER
     &login($local);&server($local);&users($local);&versions($local);
@@ -248,6 +279,11 @@ ENDHEADER
 	print ("<tr><td bgcolor='#DDBBBB'><font color='#552222' size='+2'>$trouble</font></td></tr>");
     }
     print "<tr><td bgcolor='#BBBBBB'>";
+# re-routing
+    if ($host{$local.'_reroute'}) {
+	print "<br />Reroute: ".$host{$local.'_reroute'};
+	&takeonline($local);
+    }
 # version
     if ($host{$local.'_version'}) {
 	print "<br />Version: ".$host{$local.'_version'}
@@ -367,6 +403,19 @@ foreach my $local (sort keys %hostname)
 	}
 	$host{$local.'_load'}=$userstatus{'loadavg'};
     }
+# -- Check reroute status
+    &statuslist($local,'Reroute');
+    my %reroute=&replyhash($local,'/lon-status/reroute.txt',1800);
+    if ($reroute{'status'} eq 'rerouting') {
+	if ($reroute{'server'}) {
+	    $host{$local.'_reroute'}=
+		'Rerouting to <tt>'.$reroute{'server'}.
+                   '</tt>, domain: '.$reroute{'domain'}.
+		 ' (since '.localtime($reroute{'time'}).')';
+	} else {
+	    $host{$local.'_reroute'}='offline';
+	}
+    }
 # -- Check mysql status
     &statuslist($local,'Database');
     my %mysql=&replyhash($local,'/lon-status/mysql.txt',3600);
@@ -454,7 +503,7 @@ sub reports {
 		    print 
 '<td bgcolor="'.$cellcolor.'"><font color="#225522" face="arial"><b>ok</b></td>';
 		} else {
-		    my $cellcolor='#DDBBBB';
+		    my $cellcolor='#DDCCAA';
 		    if ($connectionstatus{$local.'_TO_'.$remote} eq 'local_error') {
 			if ($local eq $remote) { 
 			    $cellcolor='#DD88AA'; 
@@ -462,7 +511,7 @@ sub reports {
 			    $cellcolor='#DDAACC';
 			}
 		    } else {
-			if ($local eq $remote) { $cellcolor='#DD9999'; }
+			if ($local eq $remote) { $cellcolor='#DDBB77'; }
 		    }
 		    print 
 		  '<td bgcolor="'.$cellcolor.'"><font color="#552222" size="-2">'.
@@ -550,6 +599,9 @@ sub reports {
 	    if ($host{$local.'_checkrpms_doomed'}>100) {
 		$trouble='RPMs outdated.<br />';
 	    }
+	    if ($host{$local.'_reroute'}) {
+		$trouble='Re-Routing<br >';
+	    }
 	    if ($trouble) { $count++; &serverstatus($local,$trouble); }
 	}
 	unless ($count) { print "No mayor trouble."; }
@@ -647,11 +699,15 @@ delete $perlvar{'lonSqlAccess'}; # remov
        while (<$fh>) {
            next if (/^(\#|\s*$)/);
            chomp;
-           my ($domain, $domain_description, $def_auth, $def_auth_arg)
-               = split(/:/,$_,4);
-           $domain_auth_def{$domain}=$def_auth;
+           my ($domain, $domain_description, $def_auth, $def_auth_arg,
+	       $def_lang, $city, $longi, $lati) = split(/:/,$_);
+	   $domain_auth_def{$domain}=$def_auth;
            $domain_auth_arg_def{$domain}=$def_auth_arg;
-           $domaindescription{$domain}=$domain_description;
+	   $domaindescription{$domain}=$domain_description;
+	   $domain_lang_def{$domain}=$def_lang;
+	   $domain_city{$domain}=$city;
+	   $domain_longi{$domain}=$longi;
+	   $domain_lati{$domain}=$lati;
        }
     }
 }