--- loncom/cgi/clusterstatus.pl	2003/08/29 17:42:32	1.20
+++ 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.20 2003/08/29 17:42:32 www Exp $
 
 use lib '/home/httpd/lib/perl/';
 use LONCAPA::Configuration;
@@ -221,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;
@@ -253,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'}
@@ -372,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);
@@ -555,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."; }