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

[raeburn]

raeburn		Wed Aug 17 00:32:27 2011 EDT

  Modified files:              
    /loncom	lond 
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - Fix subroutine name used for devalidation of cached items via lond.
  - Fix arguments in call to &reply() for devalidation of cached items
    on remote server.
  - Domain configuration for loadbalancing is at top-level of 
    configuration.db, and not at a level lower (in usersessions).   
  
  
Index: loncom/lond
diff -u loncom/lond:1.480 loncom/lond:1.481
--- loncom/lond:1.480	Fri Aug  5 04:35:45 2011
+++ loncom/lond	Wed Aug 17 00:32:19 2011
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.480 2011/08/05 04:35:45 raeburn Exp $
+# $Id: lond,v 1.481 2011/08/17 00:32:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,7 +60,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.480 $'; #' stupid emacs
+my $VERSION='$Revision: 1.481 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -1709,7 +1709,7 @@
     &Reply($client,\$result,$userinput);
     return 1;
 }
-&register_handler("devalidatecache", \&devalidatecache_handler, 0, 1, 0);
+&register_handler("devalidatecache", \&server_devalidatecache_handler, 0, 1, 0);
 
 sub server_timezone_handler {
     my ($cmd,$tail,$client) = @_;
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1129 loncom/lonnet/perl/lonnet.pm:1.1130
--- loncom/lonnet/perl/lonnet.pm:1.1129	Tue Aug  9 01:35:24 2011
+++ loncom/lonnet/perl/lonnet.pm	Wed Aug 17 00:32:27 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1129 2011/08/09 01:35:24 raeburn Exp $
+# $Id: lonnet.pm,v 1.1130 2011/08/17 00:32:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -348,7 +348,7 @@
 
 sub remote_devalidate_cache {
     my ($lonhost,$name,$id) = @_;
-    my $response = &reply('devalidatecache',&escape($name).':'.&escape($id),$lonhost);
+    my $response = &reply('devalidatecache:'.&escape($name).':'.&escape($id),$lonhost);
     return $response;
 }
 
@@ -1242,7 +1242,7 @@
         my %domconfig =
             &Apache::lonnet::get_dom('configuration',['loadbalancing'],$dom_in_use);
         if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
-            $result = &do_cache_new('loadbalancing',$dom_in_use,$domconfig{'usersessions'}{'loadbalancing'},$cachetime);
+            $result = &do_cache_new('loadbalancing',$dom_in_use,$domconfig{'loadbalancing'},$cachetime);
         }
     }
     if (ref($result) eq 'HASH') {
@@ -1308,7 +1308,7 @@
             my %domconfig =
                 &Apache::lonnet::get_dom('configuration',['loadbalancing'],$serverhomedom);
             if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
-                $result = &do_cache_new('loadbalancing',$dom_in_use,$domconfig{'usersessions'}{'loadbalancing'},$cachetime);
+                $result = &do_cache_new('loadbalancing',$dom_in_use,$domconfig{'loadbalancing'},$cachetime);
             }
         }
         if (ref($result) eq 'HASH') {