[LON-CAPA-cvs] cvs: loncom /cgi clusterstatus.pl

[raeburn]

raeburn		Fri Jul  3 16:27:01 2026 EDT

  Modified files:              
    /loncom/cgi	clusterstatus.pl 
  Log:
  - Replace use of LWP::UserAgent with LONCAPA::LWPReq and honor protocol
    (http or https) set for host (for hostID's entry in hosts.tab or from data
    retrieved from request for /adm/dns/hosts from cluster's 'DNS' server).
  
  
Index: loncom/cgi/clusterstatus.pl
diff -u loncom/cgi/clusterstatus.pl:1.29 loncom/cgi/clusterstatus.pl:1.30
--- loncom/cgi/clusterstatus.pl:1.29	Fri Jul  3 14:20:26 2026
+++ loncom/cgi/clusterstatus.pl	Fri Jul  3 16:27:01 2026
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 $|=1;
 # Generates a html page showing various status reports about the domain or cluster
-# $Id: clusterstatus.pl,v 1.29 2026/07/03 14:20:26 raeburn Exp $
+# $Id: clusterstatus.pl,v 1.30 2026/07/03 16:27:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,8 +34,7 @@
 use LONCAPA::Configuration;
 use LONCAPA::loncgi;
 use LONCAPA::lonauthcgi;
-use LWP::UserAgent();
-use HTTP::Headers;
+use LONCAPA::LWPReq;
 use IO::File;
 
 my $perlvar=&LONCAPA::Configuration::read_conf('loncapa.conf');
@@ -122,11 +121,16 @@
     }
     unless ($reply) {
         if ($hostname{$local}) {
-	    my $ua=new LWP::UserAgent(timeout => 20);
-	    my $request=new HTTP::Request('GET',
-					  "http://".$hostname{$local}.$url);
-	    my $response=$ua->request($request);
-	    if ($response->is_success) {
+            my $protocol = $Apache::lonnet::protocol{$local};
+            $protocol = 'http' if ($protocol ne 'https');
+            my $requrl = $protocol.'://'.$hostname{$local}.$url;
+            my $uselocal = 0;
+            if (grep { $_ eq $local } &Apache::lonnet::current_machine_ids()) {
+                $uselocal = 1;
+            }
+            my $request=new HTTP::Request('GET',$requrl);
+            my $response = &LONCAPA::LWPReq::makerequest('',$request,'','',20,0,'',$uselocal);
+            if ($response->is_success) {
                 $reply=$response->content;
                 chomp($reply);
             } else {