Merge pull request #607 from OSC/revert_xdmod_change

Revert "make xdmod auto-login timeout configurable"
OSC · Jul 22, 2020 · f416993 · f416993
2 parents 00b9e96 + f20f9dd
commit f416993
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/apps/dashboard/app/assets/javascripts/application.js b/apps/dashboard/app/assets/javascripts/application.js
@@ -74,7 +74,7 @@ function installSettingHandlers(name) {
 }
 
 
-function promiseLoginToXDMoD(xdmodUrl, timeoutms){
+function promiseLoginToXDMoD(xdmodUrl){
   return new Promise(function(resolve, reject){
 
     var promise_to_receive_message_from_iframe = new Promise(function(resolve, reject){
@@ -116,7 +116,7 @@ function promiseLoginToXDMoD(xdmodUrl, timeoutms){
       })
       .then(() => {
         return Promise.race([promise_to_receive_message_from_iframe, new Promise(function(resolve, reject){
-          setTimeout(reject, timeoutms, new Error('Login failed: Timeout waiting for login to complete'));
+          setTimeout(reject, 5000, new Error('Login failed: Timeout waiting for login to complete'));
         })]);
       })
       .then(() => {
@@ -129,7 +129,7 @@ function promiseLoginToXDMoD(xdmodUrl, timeoutms){
 }
 
 var promiseLoggedIntoXDMoD = (function(){
-  return _.memoize(function(xdmodUrl, timeoutms = 5000){
+  return _.memoize(function(xdmodUrl){
     return fetch(xdmodUrl + '/rest/v1/users/current', { credentials: 'include' })
       .then(response => response.ok ? Promise.resolve() : promiseLoginToXDMoD(xdmodUrl))
   });

diff --git a/apps/dashboard/app/views/dashboard/_xdmod_widget_job_efficiency.html.erb b/apps/dashboard/app/views/dashboard/_xdmod_widget_job_efficiency.html.erb
@@ -88,7 +88,7 @@ render_jobs_template({nodata: true, msg: 'LOADING...'});
 render_core_hours_template({nodata: true, msg: 'LOADING...'});
 
 var xdmodUrl = '<%= Configuration.xdmod_host %>';
-promiseLoggedIntoXDMoD(xdmodUrl, <%= Configuration.xdmod_login_timeout %>)
+promiseLoggedIntoXDMoD(xdmodUrl)
   .then(() => fetch(jobsUrl, { credentials: 'include' }))
   .then(response => response.ok ? Promise.resolve(response) : Promise.reject(new Error(response.statusText)))
   .then(response => response.json())

diff --git a/apps/dashboard/app/views/dashboard/_xdmod_widget_jobs.html.erb b/apps/dashboard/app/views/dashboard/_xdmod_widget_jobs.html.erb
@@ -138,7 +138,7 @@ var render_template = function(context){
 render_template({loading: true});
 
 var xdmodUrl = '<%= Configuration.xdmod_host %>';
-promiseLoggedIntoXDMoD(xdmodUrl, <%= Configuration.xdmod_login_timeout %>)
+promiseLoggedIntoXDMoD(xdmodUrl)
   .then(() => fetch(jobsUrl, { credentials: 'include' }))
   .then(response => response.ok ? Promise.resolve(response) : Promise.reject(new Error(response.statusText)))
   .then(response => response.json())

diff --git a/apps/dashboard/config/configuration_singleton.rb b/apps/dashboard/config/configuration_singleton.rb
@@ -132,18 +132,12 @@ def balance_threshold
     ENV.fetch("OOD_BALANCE_THRESHOLD", 0).to_f
   end
 
-  # The XDMoD host
+  # The XMoD host
   # @return [String, null] the host, or null if not set
   def xdmod_host
     ENV["OOD_XDMOD_HOST"]
   end
 
-  # The XDMoD login timeout in milliseconds
-  # @return [String] the number of milliseconds before timing out auto-login
-  def xdmod_login_timeout
-    ENV['OOD_XDMOD_LOGIN_TIMEOUT'] || '5000'
-  end
-
   # Whether or not XDMoD integration is enabled
   # @return [Boolean]
   def xdmod_integration_enabled?