--- loncom/cgi/clusterstatus.pl 2002/05/11 21:29:42 1.3 +++ loncom/cgi/clusterstatus.pl 2003/02/25 21:56:48 1.7 @@ -6,7 +6,6 @@ $|=1; # (Running loncron # 09/06/01 Gerd Kortemeyer) # 02/18/02,02/19/02 Gerd Kortemeyer) -# 5/11/2002 Scott Harrison use lib '/home/httpd/lib/perl/'; use LONCAPA::Configuration; @@ -14,16 +13,6 @@ use LONCAPA::Configuration; use LWP::UserAgent(); use HTTP::Headers; use IO::File; -use Net::Ping; - -sub online { - my $host=shift; - my $p=Net::Ping->new("tcp",10); - my $online=$p->ping("$host"); - $p->close(); - undef ($p); - return $online; -} sub connected { my ($local,$remote)=@_; @@ -33,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', @@ -54,8 +41,8 @@ sub connected { print "Content-type: text/html\n\n". "\n"; -# ------------------------------------------- Read access.conf and loncapa.conf -my $perlvarref=LONCAPA::Configuration::read_conf('access.conf','loncapa.conf'); +# -------------------- 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 @@ -67,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; @@ -98,7 +87,7 @@ foreach $remote (sort keys %hostname) { } $table.=""; foreach $local (sort keys %hostname) { - print "Checking $local "; + print "Checking $local: "; $table.="
". "New Report". ""; - if (&online($hostname{$local})) { foreach $remote (sort keys %hostname) { $status=&connected($local,$remote); if ($status eq 'ok') { @@ -132,21 +120,12 @@ foreach $local (sort keys %hostname) { print "X"; $table.="".$status."
". "lonc"; - if (&online($hostname{$remote})) { - $table.=" lonc". + " lond". ""; - } else { - $table.=' offline'; - } - } } - } else { - print "offline"; - $table.='Offline'; - } $table.="\n"; print "
\n"; }