--- loncom/auth/lonlogin.pm	2003/04/02 14:57:32	1.39
+++ loncom/auth/lonlogin.pm	2003/05/08 22:23:19	1.42
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.39 2003/04/02 14:57:32 www Exp $
+# $Id: lonlogin.pm,v 1.42 2003/05/08 22:23:19 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -66,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');
@@ -86,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
@@ -411,6 +416,14 @@ ENDLOGIN
         <small><tt>&nbsp;$loadpercent percent</tt></small>
        </td>
       </tr>
+      <tr>
+       <td bgcolor="$sidebg" align="left" valign="top">
+        <small><b>&nbsp;&nbsp;&nbsp;User&nbsp;Load:&nbsp;</b></small>
+       </td>
+       <td bgcolor="$sidebg" align="left" valign="top">
+        <small><tt>&nbsp;$userloadpercent percent</tt></small>
+       </td>
+      </tr>
      </table>
      <br />
     <small>