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.39 and 1.43

version 1.39, 2003/04/02 14:57:32	version 1.43, 2003/07/16 20:42:31
Line 51 sub handler {	Line 51 sub handler {

&Apache::loncommon::get_unprocessed_cgi	&Apache::loncommon::get_unprocessed_cgi
($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'},	($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'},
['interface','username','domain','firsturl']);	['interface','username','domain','firsturl','localpath','localres']);

# ----------------------------------------------------------- Process Interface	# ----------------------------------------------------------- Process Interface
$ENV{'form.interface'}=~s/\W//g;	$ENV{'form.interface'}=~s/\W//g;
Line 66 sub handler {	Line 66 sub handler {
}	}

my $fullgraph=($ENV{'form.interface'} ne 'textual');	my $fullgraph=($ENV{'form.interface'} ne 'textual');
	my $port_to_use=$r->dir_config('lonhttpdPort');
my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':8080'.	if (!defined($port_to_use)) {
	$port_to_use='8080';
	}
	my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
$r->dir_config('lonIconsURL');	$r->dir_config('lonIconsURL');
my $domain = $r->dir_config('lonDefDomain');	my $domain = $r->dir_config('lonDefDomain');
my $role = $r->dir_config('lonRole');	my $role = $r->dir_config('lonRole');
Line 86 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 258 ENDSCRIPT	Line 263 ENDSCRIPT
<input type="hidden" name="fontenhance" value="" />	<input type="hidden" name="fontenhance" value="" />
<input type="hidden" name="blackwhite" value="" />	<input type="hidden" name="blackwhite" value="" />
<input type="hidden" name="remember" value="" />	<input type="hidden" name="remember" value="" />
	<input type="hidden" name="localpath" value="$ENV{'form.localpath'}" />
	<input type="hidden" name="localres" value="$ENV{'form.localres'}" />
</form>	</form>
ENDSERVERFORM	ENDSERVERFORM
if ($fullgraph) { $r->print(<<ENDTOP);	if ($fullgraph) { $r->print(<<ENDTOP);
Line 411 ENDLOGIN	Line 418 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.39
changed lines
	Added in v.1.43