--- loncom/lond 2003/05/08 21:35:48 1.128 +++ loncom/lond 2003/06/16 14:23:56 1.131 @@ -2,7 +2,7 @@ # The LearningOnline Network # lond "LON Daemon" Server (port "LOND" 5663) # -# $Id: lond,v 1.128 2003/05/08 21:35:48 albertel Exp $ +# $Id: lond,v 1.131 2003/06/16 14:23:56 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -73,7 +73,7 @@ my $DEBUG = 0; # Non zero to ena my $status=''; my $lastlog=''; -my $VERSION='$Revision: 1.128 $'; #' stupid emacs +my $VERSION='$Revision: 1.131 $'; #' 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); } } @@ -2081,15 +2081,16 @@ sub userload { while ($filename=readdir(LONIDS)) { if ($filename eq '.' || $filename eq '..') {next;} my ($atime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[8]; - if ($curtime-$atime < 3600) { $num_users++; } + if ($curtime-$atime < 3600) { $numusers++; } } closedir(LONIDS); } my $userloadpercent=0; my $maxuserload=$perlvar{'lonUserLoadLim'}; if ($maxuserload) { - $userloadpercent=100*$num_users/$maxuserload; + $userloadpercent=100*$numusers/$maxuserload; } + $userloadpercent=sprintf("%.2f",$userloadpercent); return $userloadpercent; }