[LON-CAPA-cvs] cvs: loncom / lond /cgi userstatus.pl /lonnet/perl lonnet.pm

albertel lon-capa-cvs@mail.lon-capa.org
Thu, 30 Oct 2003 22:52:25 -0000


albertel		Thu Oct 30 17:52:25 2003 EDT

  Modified files:              
    /loncom	lond 
    /loncom/lonnet/perl	lonnet.pm 
    /loncom/cgi	userstatus.pl 
  Log:
  - Gerd thinks it would be better at a half hour
  
  
Index: loncom/lond
diff -u loncom/lond:1.158 loncom/lond:1.159
--- loncom/lond:1.158	Tue Oct 21 05:14:31 2003
+++ loncom/lond	Thu Oct 30 17:52:24 2003
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.158 2003/10/21 09:14:31 foxr Exp $
+# $Id: lond,v 1.159 2003/10/30 22:52:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,47 +26,6 @@
 #
 # http://www.lon-capa.org/
 #
-# 5/26/99,6/4,6/10,6/11,6/14,6/15,6/26,6/28,6/30,
-# 7/8,7/9,7/10,7/12,7/17,7/19,9/21,
-# 10/7,10/8,10/9,10/11,10/13,10/15,11/4,11/16,
-# 12/7,12/15,01/06,01/11,01/12,01/14,2/8,
-# 03/07,05/31 Gerd Kortemeyer
-# 06/29,06/30,07/14,07/15,07/17,07/20,07/25,09/18 Gerd Kortemeyer
-# 12/05,12/13,12/29 Gerd Kortemeyer
-# YEAR=2001
-# 02/12 Gerd Kortemeyer
-# 03/24 Gerd Kortemeyer
-# 05/11,05/28,08/30 Gerd Kortemeyer
-# 11/26,11/27 Gerd Kortemeyer
-# 12/22 Gerd Kortemeyer
-# YEAR=2002
-# 01/20/02,02/05 Gerd Kortemeyer
-# 02/05 Guy Albertelli
-# 02/12 Gerd Kortemeyer
-# 02/19 Matthew Hall
-# 02/25 Gerd Kortemeyer
-# 01/xx/2003 Ron Fox.. Remove preforking.  This makes the general daemon
-#      logic simpler (and there were problems maintaining the preforked
-#      population).  Since the time averaged connection rate is close to zero
-#      because lonc's purpose is to maintain near continuous connnections,
-#      preforking is not really needed.
-# 08/xx/2003 Ron Fox:  Add management requests.  Management requests
-#      will be validated via a call to ValidateManager. At present, this
-#      is done by simple host verification.  In the future we can modify
-#      this function to do a certificate check.
-#      Management functions supported include:
-#       - pushing /home/httpd/lonTabs/hosts.tab
-#       - pushing /home/httpd/lonTabs/domain.tab
-# 09/08/2003 Ron Fox:  Told lond to take care of change logging so we
-#      don't have to remember it:
-#
-# Change Log:
-#   $Log: lond,v $
-#   Revision 1.158  2003/10/21 09:14:31  foxr
-#   Re-install $Log$ in comment header to support automatic change logging.
-#
-#
-
 
 use strict;
 use lib '/home/httpd/lib/perl/';
@@ -91,7 +50,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.158 $'; #' stupid emacs
+my $VERSION='$Revision: 1.159 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid;
 my $currentdomainid;
@@ -2624,7 +2583,7 @@
 	while ($filename=readdir(LONIDS)) {
 	    if ($filename eq '.' || $filename eq '..') {next;}
 	    my ($mtime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[9];
-	    if ($curtime-$mtime < 3600) { $numusers++; }
+	    if ($curtime-$mtime < 1800) { $numusers++; }
 	}
 	closedir(LONIDS);
     }
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.436 loncom/lonnet/perl/lonnet.pm:1.437
--- loncom/lonnet/perl/lonnet.pm:1.436	Thu Oct 30 15:22:00 2003
+++ loncom/lonnet/perl/lonnet.pm	Thu Oct 30 17:52:25 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.436 2003/10/30 20:22:00 albertel Exp $
+# $Id: lonnet.pm,v 1.437 2003/10/30 22:52:25 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -367,7 +367,7 @@
 	while ($filename=readdir(LONIDS)) {
 	    if ($filename eq '.' || $filename eq '..') {next;}
 	    my ($mtime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[9];
-	    if ($curtime-$mtime < 3600) { $numusers++; }
+	    if ($curtime-$mtime < 1800) { $numusers++; }
 	}
 	closedir(LONIDS);
     }
Index: loncom/cgi/userstatus.pl
diff -u loncom/cgi/userstatus.pl:1.7 loncom/cgi/userstatus.pl:1.8
--- loncom/cgi/userstatus.pl:1.7	Sun Aug 31 23:37:27 2003
+++ loncom/cgi/userstatus.pl	Thu Oct 30 17:52:25 2003
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 $|=1;
 # User Status
-# $Id: userstatus.pl,v 1.7 2003/09/01 03:37:27 albertel Exp $
+# $Id: userstatus.pl,v 1.8 2003/10/30 22:52:25 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,7 +50,7 @@
     my $userclass=$actl[0];
     if ($since>300) { $color="#222222"; }
     if ($since>600) { $color="#444444"; }
-    if ($since>3600) { $color="#666666"; $userclass=$actl[1]; }
+    if ($since>1800) { $color="#666666"; $userclass=$actl[1]; }
     if ($since>7200) { $color="#888888"; }
     if ($since>21600) { $color="#AAAAAA"; $userclass=$actl[2]; }
     return ($color,$userclass);