--- loncom/cgi/clusterstatus.pl	2003/02/03 18:03:52	1.6
+++ loncom/cgi/clusterstatus.pl	2003/02/25 21:56:48	1.7
@@ -13,18 +13,6 @@ use LONCAPA::Configuration;
 use LWP::UserAgent();
 use HTTP::Headers;
 use IO::File;
-use Net::Ping;
-
-sub online {
-    my $host=shift;
-    return 1;
-# ping is broken
-    my $p=Net::Ping->new("tcp",10);
-    my $online=$p->ping("$host");
-    $p->close();
-    undef ($p);
-    return $online;
-}
 
 sub connected {
     my ($local,$remote)=@_;
@@ -34,8 +22,6 @@ sub connected {
     unless ($hostname{$local}) { return 'local_unknown'; }
     unless ($hostname{$remote}) { return 'remote_unknown'; }
 
-    unless (&online($hostname{$local})) { return 'local_offline'; }
-
     my $ua=new LWP::UserAgent;
     
     my $request=new HTTP::Request('GET',
@@ -68,6 +54,8 @@ delete $perlvar{'lonSqlAccess'}; # remov
 
     $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;
@@ -99,7 +87,7 @@ foreach $remote (sort keys %hostname) {
 }
 $table.="</tr>";
 foreach $local (sort keys %hostname) {
-    print "Checking $local ";
+   print "Checking $local: ";
    $table.="<tr><td";
    if ($local eq $perlvar{'lonHostID'}) {
        $table.=" bgcolor=#CCFFBB";
@@ -113,7 +101,6 @@ foreach $local (sort keys %hostname) {
       $hostname{$local}."</a></tt><br>".
      "<a href=http://".$hostname{$local}."/cgi-bin/loncron.pl>New Report</a>".
      "</td>";
-  if (&online($hostname{$local})) {
    foreach $remote (sort keys %hostname) {
        $status=&connected($local,$remote);
        if ($status eq 'ok') {
@@ -133,21 +120,12 @@ foreach $local (sort keys %hostname) {
            print "X";
            $table.="<td><b><font color=#FF0000>".$status."</font></b><br>".
      "<a href=http://".$hostname{$local}.
-	 "/lon-status/loncstatus.txt>lonc</a>";
-           if (&online($hostname{$remote})) {
-              $table.=" <a href=http://".$hostname{$remote}.
+	 "/lon-status/loncstatus.txt>lonc</a>".
+    " <a href=http://".$hostname{$remote}.
       "/lon-status/londstatus.txt>lond</a>".
             "</td>";
-	  } else {
-              $table.=' offline';
-          }
-  
        }
    }
-  } else {
-      print "offline";
-      $table.='<th colspan='.$total.'><font color=#FF0000>Offline</font></th>';
-  }
    $table.="</tr>\n";
     print "<br>\n";
 }