loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

Up to [LON-CAPA] / loncom / lonnet / perl

-version 1.410, 2003/09/10 15:53:16
+version 1.411, 2003/09/11 07:57:03
  Line 436  sub spareserver {
      my $lowestserver=$loadpercent > $userloadpercent?
  	             $loadpercent :  $userloadpercent;
      foreach $tryserver (keys %spareid) {
-        my $loadans=reply('load',$tryserver);
+ 	my $loadans=reply('load',$tryserver);
-        my $userloadans=reply('userload',$tryserver);
+ 	my $userloadans=reply('userload',$tryserver);
-        if ($userloadans !~ /\d/) { $userloadans=0; }
+ 	if ($loadans !~ /\d/ && $userloadans !~ /\d/) {
-        my $answer=$loadans > $userloadans?
+ 	    next; #didn't get a number from the server
-                   $loadans :  $userloadans;
+ 	}
-        if (($answer =~ /\d/) && ($answer<$lowestserver)) {
+ 	my $answer;
- 	   $spareserver="http://$hostname{$tryserver}";
+ 	if ($loadans =~ /\d/) {
-            $lowestserver=$answer;
+ 	    if ($userloadans =~ /\d/) {
-        }
+ 		#both are numbers, pick the bigger one
+ 		$answer=$loadans > $userloadans?
+ 		    $loadans :  $userloadans;
+ 	    } else {
+ 		$answer = $loadans;
+ 	    }
+ 	} else {
+ 	    $answer = $userloadans;
+ 	}
+ 	if (($answer =~ /\d/) && ($answer<$lowestserver)) {
+ 	    $spareserver="http://$hostname{$tryserver}";
+ 	    $lowestserver=$answer;
+ 	}
      }
      return $spareserver;
  }