--- loncom/auth/lonlogin.pm 2003/03/02 02:16:53 1.37
+++ loncom/auth/lonlogin.pm 2003/05/08 21:50:54 1.41
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.37 2003/03/02 02:16:53 www Exp $
+# $Id: lonlogin.pm,v 1.41 2003/05/08 21:50:54 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -50,8 +50,9 @@ sub handler {
&Apache::loncommon::get_unprocessed_cgi
- ($ENV{'QUERY_STRING'},['interface','username','domain','firsturl']);
-
+ ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'},
+ ['interface','username','domain','firsturl']);
+
# ----------------------------------------------------------- Process Interface
$ENV{'form.interface'}=~s/\W//g;
@@ -65,8 +66,11 @@ sub handler {
}
my $fullgraph=($ENV{'form.interface'} ne 'textual');
-
- my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':8080'.
+ my $port_to_use=$r->dir_config('lonhttpdPort');
+ if (!defined($port_to_use)) {
+ $port_to_use='8080';
+ }
+ my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
$r->dir_config('lonIconsURL');
my $domain = $r->dir_config('lonDefDomain');
my $role = $r->dir_config('lonRole');
@@ -85,20 +89,22 @@ sub handler {
# ---------------------------------------------------------- Determine own load
my $loadavg;
- {
- my $loadfile=Apache::File->new('/proc/loadavg');
- $loadavg=<$loadfile>;
- }
+ {
+ my $loadfile=Apache::File->new('/proc/loadavg');
+ $loadavg=<$loadfile>;
+ }
$loadavg =~ s/\s.*//g;
my $loadpercent=100*$loadavg/$loadlim;
+ my $userloadpercent=&Apache::lonnet::userload();
# ------------------------------------------------------- Do the load balancing
my $otherserver='http://'.$ENV{'SERVER_NAME'};
my $firsturl=
($ENV{'request.firsturl'}?$ENV{'request.firsturl'}:$ENV{'form.firsturl'});
# ---------------------------------------- Are we access server and overloaded?
- if (($role eq 'access') && ($loadpercent>100.0)) {
- $otherserver=Apache::lonnet::spareserver($loadpercent);
+ if (($role eq 'access') &&
+ (($userloadpercent>100.0)||($loadpercent>100.0))) {
+ $otherserver=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
}
# -------------------------------------------------------- Set login parameters
@@ -157,6 +163,9 @@ ENDTROUBLE
# ----------------------------------------------- Apparently we are in business
my $domainlogo=&Apache::loncommon::domainlogo();
+ $servadm=~s/\,/\
/g;
+ $sysadm=~s/\,/\
/g;
+
# --------------------------------------------------- Print login screen header
$r->print(<