loncom/auth/lonlogin.pm - diff

Return to lonlogin.pm CVS log

Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/lonlogin.pm between versions 1.40 and 1.42

version 1.40, 2003/04/03 21:53:51	version 1.42, 2003/05/08 22:23:19
Line 89 sub handler {	Line 89 sub handler {

# ---------------------------------------------------------- Determine own load	# ---------------------------------------------------------- Determine own load
my $loadavg;	my $loadavg;
{	{
my $loadfile=Apache::File->new('/proc/loadavg');	my $loadfile=Apache::File->new('/proc/loadavg');
$loadavg=<$loadfile>;	$loadavg=<$loadfile>;
}	}
$loadavg =~ s/\s.*//g;	$loadavg =~ s/\s.*//g;
my $loadpercent=100*$loadavg/$loadlim;	my $loadpercent=100*$loadavg/$loadlim;
	my $userloadpercent=&Apache::lonnet::userload();

# ------------------------------------------------------- Do the load balancing	# ------------------------------------------------------- Do the load balancing
my $otherserver='http://'.$ENV{'SERVER_NAME'};	my $otherserver='http://'.$ENV{'SERVER_NAME'};
my $firsturl=	my $firsturl=
($ENV{'request.firsturl'}?$ENV{'request.firsturl'}:$ENV{'form.firsturl'});	($ENV{'request.firsturl'}?$ENV{'request.firsturl'}:$ENV{'form.firsturl'});
# ---------------------------------------- Are we access server and overloaded?	# ---------------------------------------- Are we access server and overloaded?
if (($role eq 'access') && ($loadpercent>100.0)) {	if (($role eq 'access') &&
$otherserver=Apache::lonnet::spareserver($loadpercent);	(($userloadpercent>100.0)\|\|($loadpercent>100.0))) {
	$otherserver=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
}	}

# -------------------------------------------------------- Set login parameters	# -------------------------------------------------------- Set login parameters
Line 414 ENDLOGIN	Line 416 ENDLOGIN
<small><tt> $loadpercent percent</tt></small>	<small><tt> $loadpercent percent</tt></small>
</td>	</td>
</tr>	</tr>
	<tr>
	<td bgcolor="$sidebg" align="left" valign="top">
	<small><b>   User Load: </b></small>
	</td>
	<td bgcolor="$sidebg" align="left" valign="top">
	<small><tt> $userloadpercent percent</tt></small>
	</td>
	</tr>
</table>	</table>
<br />	<br />
<small>	<small>

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.40
changed lines
	Added in v.1.42