[LON-CAPA-cvs] cvs: loncom /auth migrateuser.pm

raeburn raeburn at source.lon-capa.org
Sun Jun 16 18:27:06 EDT 2019


raeburn		Sun Jun 16 22:27:06 2019 EDT

  Modified files:              
    /loncom/auth	migrateuser.pm 
  Log:
  - Domain config for load balancer to use cookie to record offload target.
  
  
Index: loncom/auth/migrateuser.pm
diff -u loncom/auth/migrateuser.pm:1.44 loncom/auth/migrateuser.pm:1.45
--- loncom/auth/migrateuser.pm:1.44	Sat Jun 15 02:50:04 2019
+++ loncom/auth/migrateuser.pm	Sun Jun 16 22:27:06 2019
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.44 2019/06/15 02:50:04 raeburn Exp $
+# $Id: migrateuser.pm,v 1.45 2019/06/16 22:27:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,9 +71,6 @@
             $extra_env{'request.sso.reloginserver'} = 
                 $data->{'sso.reloginserver'};
         }
-        if (($data->{'balancer'}) && ($data->{'server'}) && ($data->{'balcookie'})) {
-            $extra_env{'request.balancercookie'} = $data->{'server'}.':'.$data->{'balcookie'};
-        }
     }
     return \%extra_env;
 }
@@ -115,9 +112,6 @@
         if ($data->{'lti.rosterurl'}) {
             $lti_env{'request.lti.rosterurl'} = $data->{'lti.rosterurl'};
         }
-        if (($data->{'balancer'}) && ($data->{'server'}) && ($data->{'balcookie'})) {
-            $lti_env{'request.balancercookie'} = $data->{'server'}.':'.$data->{'balcookie'};
-        }
     }
     return \%lti_env;
 }
@@ -659,6 +653,13 @@
     } elsif ((ref($lti_env) eq 'HASH') && (keys(%{$lti_env}))) {
         $extra_env = $lti_env;
     }
+    if (($data{'balancer'}) && ($data{'server'}) && ($data{'balcookie'})) {
+        if (ref($extra_env) eq 'HASH') {
+            $extra_env->{'request.balancercookie'} = $data{'server'}.':'.$data{'balcookie'};
+        } else {
+            $extra_env = { 'request.balancercookie' => $data{'server'}.':'.$data{'balcookie'} };
+        }
+    }
 
     if (($data{'conlost'}) && ($data{'server'})) {
         my @conlosts = split(/,/,$data{'conlost'});




More information about the LON-CAPA-cvs mailing list