--- loncom/lond	2003/04/05 00:11:34	1.125
+++ loncom/lond	2003/08/22 16:26:11	1.132.2.1
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.125 2003/04/05 00:11:34 foxr Exp $
+# $Id: lond,v 1.132.2.1 2003/08/22 16:26:11 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -57,7 +57,7 @@ use LONCAPA::Configuration;
 
 use IO::Socket;
 use IO::File;
-use Apache::File;
+#use Apache::File;
 use Symbol;
 use POSIX;
 use Crypt::IDEA;
@@ -73,7 +73,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.125 $'; #' stupid emacs
+my $VERSION='$Revision: 1.132.2.1 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid;
 my $currentdomainid;
@@ -276,11 +276,11 @@ sub checkchildren {
             alarm(300);
 	    &logthis('Child '.$_.' did not respond');
 	    kill 9 => $_;
-	    $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
-	    $subj="LON: $currenthostid killed lond process $_";
-	    my $result=`echo 'Killed lond process $_.' | mailto $emailto -s '$subj' > /dev/null`;
-	    $execdir=$perlvar{'lonDaemons'};
-	    $result=`/bin/cp $execdir/logs/lond.log $execdir/logs/lond.log.$_`;
+	    #$emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
+	    #$subj="LON: $currenthostid killed lond process $_";
+	    #my $result=`echo 'Killed lond process $_.' | mailto $emailto -s '$subj' > /dev/null`;
+	    #$execdir=$perlvar{'lonDaemons'};
+	    #$result=`/bin/cp $execdir/logs/lond.log $execdir/logs/lond.log.$_`;
 	    alarm(0);
 	  }
         }
@@ -536,6 +536,8 @@ sub make_new_child {
     } else {
         # Child can *not* return from this subroutine.
         $SIG{INT} = 'DEFAULT';      # make SIGINT kill us as it did before
+        $SIG{CHLD} = 'DEFAULT'; #make this default so that pwauth returns 
+                                #don't get intercepted
         $SIG{USR1}= \&logstatus;
         $SIG{ALRM}= \&timeout;
         $lastlog='Forked ';
@@ -663,8 +665,12 @@ sub make_new_child {
                           $loadavg=<$loadfile>;
                        }
                        $loadavg =~ s/\s.*//g;
-                       my $loadpercent=100*$loadavg/$perlvar{'lonLoadLim'};
+		       my $loadpercent=100*$loadavg/$perlvar{'lonLoadLim'};
 		       print $client "$loadpercent\n";
+# -------------------------------------------------------------------- userload
+		   } elsif ($userinput =~ /^userload/) {
+		       my $userloadpercent=&userload();
+		       print $client "$userloadpercent\n";
 # ----------------------------------------------------------------- currentauth
 		   } elsif ($userinput =~ /^currentauth/) {
 		     if ($wasenc==1) {
@@ -820,7 +826,7 @@ sub make_new_child {
 			     if ($pwdcorrect) {
 				 my $execdir=$perlvar{'lonDaemons'};
 				 &Debug("Opening lcpasswd pipeline");
-				 my $pf = IO::File->new("|$execdir/lcpasswd > /home/www/lcpasswd.log");
+				 my $pf = IO::File->new("|$execdir/lcpasswd > $perlvar{'lonDaemons'}/logs/lcpasswd.log");
 				 print $pf "$uname\n$npass\n$npass\n";
 				 close $pf;
 				 my $err = $?;
@@ -2020,7 +2026,7 @@ sub make_passwd_file {
 	    {
 		&Debug("Executing external: ".$execpath);
 		&Debug("user  = ".$uname.", Password =". $npass);
-		my $se = IO::File->new("|$execpath > /home/www/lcuseradd.log");
+		my $se = IO::File->new("|$execpath > $perlvar{'lonDaemons'}/logs/lcuseradd.log");
 		print $se "$uname\n";
 		print $se "$npass\n";
 		print $se "$npass\n";
@@ -2065,6 +2071,29 @@ sub version {
     return "version:$VERSION";
 }
 
+#There is a copy of this in lonnet.pm
+sub userload {
+    my $numusers=0;
+    {
+	opendir(LONIDS,$perlvar{'lonIDsDir'});
+	my $filename;
+	my $curtime=time;
+	while ($filename=readdir(LONIDS)) {
+	    if ($filename eq '.' || $filename eq '..') {next;}
+	    my ($mtime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[9];
+	    if ($curtime-$mtime < 3600) { $numusers++; }
+	}
+	closedir(LONIDS);
+    }
+    my $userloadpercent=0;
+    my $maxuserload=$perlvar{'lonUserLoadLim'};
+    if ($maxuserload) {
+	$userloadpercent=100*$numusers/$maxuserload;
+    }
+    $userloadpercent=sprintf("%.2f",$userloadpercent);
+    return $userloadpercent;
+}
+
 # ----------------------------------- POD (plain old documentation, CPAN style)
 
 =head1 NAME