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

[raeburn]

raeburn		Tue Aug  9 00:28:52 2011 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - Eliminate duplication of code used to retrieve domain configuration for
    spares to offload to.
    - New routine: &spares_for_offload() provides common code.
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1125 loncom/lonnet/perl/lonnet.pm:1.1126
--- loncom/lonnet/perl/lonnet.pm:1.1125	Fri Aug  5 04:35:50 2011
+++ loncom/lonnet/perl/lonnet.pm	Tue Aug  9 00:28:51 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1125 2011/08/05 04:35:50 raeburn Exp $
+# $Id: lonnet.pm,v 1.1126 2011/08/09 00:28:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1142,43 +1142,47 @@
 
 sub this_host_spares {
     my ($dom) = @_;
-    my $cachetime = 60*60*24;
+    my ($dom_in_use,$lonhost_in_use,$result);
     my @hosts = &current_machine_ids();
     foreach my $lonhost (@hosts) {
         if (&host_domain($lonhost) eq $dom) {
-            my ($result,$cached)=&is_cached_new('spares',$dom);
-            if (defined($cached)) {
-                return $result;
-            } else {
-                my %domconfig =
-                    &Apache::lonnet::get_dom('configuration',['usersessions'],$dom);
-                if (ref($domconfig{'usersessions'}) eq 'HASH') {
-                    if (ref($domconfig{'usersessions'}{'spares'}) eq 'HASH') {
-                        if (ref($domconfig{'usersessions'}{'spares'}{$lonhost}) eq 'HASH') {
-                            return &do_cache_new('spares',$dom,$domconfig{'usersessions'}{'spares'}{$lonhost},$cachetime);
-                        }
-                    }
-                }
-            }
+            $dom_in_use = $dom;
+            $lonhost_in_use = $lonhost;
             last;
         }
     }
-    my $serverhomedom = &host_domain($perlvar{'lonHostID'});
-    my ($result,$cached)=&is_cached_new('spares',$serverhomedom);
+    if ($dom_in_use ne '') {
+        $result = &spares_for_offload($dom_in_use,$lonhost_in_use);
+    }
+    if (ref($result) ne 'HASH') {
+        $lonhost_in_use = $perlvar{'lonHostID'};
+        $dom_in_use = &host_domain($lonhost_in_use);
+        $result = &spares_for_offload($dom_in_use,$lonhost_in_use);
+        if (ref($result) ne 'HASH') {
+            $result = \%spareid;
+        }
+    }
+    return $result;
+}
+
+sub spares_for_offload  {
+    my ($dom_in_use,$lonhost_in_use) = @_;
+    my ($result,$cached)=&is_cached_new('spares',$dom_in_use);
     if (defined($cached)) {
         return $result;
     } else {
-        my %homedomconfig =
-            &Apache::lonnet::get_dom('configuration',['usersessions'],$serverhomedom);
-        if (ref($homedomconfig{'usersessions'}) eq 'HASH') {
-            if (ref($homedomconfig{'usersessions'}{'spares'}) eq 'HASH') {
-                if (ref($homedomconfig{'usersessions'}{'spares'}{$perlvar{'lonHostID'}}) eq 'HASH') {
-                    return &do_cache_new('spares',$serverhomedom,$homedomconfig{'usersessions'}{'spares'}{$perlvar{'lonHostID'}},$cachetime);
+        my $cachetime = 60*60*24;
+        my %domconfig =
+            &Apache::lonnet::get_dom('configuration',['usersessions'],$dom_in_use);
+        if (ref($domconfig{'usersessions'}) eq 'HASH') {
+            if (ref($domconfig{'usersessions'}{'spares'}) eq 'HASH') {
+                if (ref($domconfig{'usersessions'}{'spares'}{$lonhost_in_use}) eq 'HASH') {
+                    return &do_cache_new('spares',$dom_in_use,$domconfig{'usersessions'}{'spares'}{$lonhost_in_use},$cachetime);
                 }
             }
         }
     }
-    return \%spareid;
+    return;
 }
 
 # ---------------------- Find the homebase for a user from domain's lib servers