ajax timeout = gateway timeout

Elena.Budnik
1 parent 2f2931b7
Showing 2 changed files with 16 additions and 7 deletions Show diff stats
desktop.php
js/app/models/ExecutableNode.js
@@ -7,7 +7,6 @@
  
  
   require_once('php/config.php');
-
   // error_reporting(E_ALL);
   if (!isset($_POST['username'])) {
     header('Location: index.html');
@@ -107,6 +106,8 @@
         var max_uploaded_file_size = '<?php echo MAX_UPLOADED_FILESIZE; ?>';
         var guestSessionDuration = '<?php echo GuestSessionDuration*60; ?>'; // in secs
         var maxGuestTimeInterval = '<?php echo MaxGuestTimeInterval; ?>';    // in days
+        
+        var gatewayTimeout = '<?php if (defined('GATEWAY_TIMEOUT')) echo GATEWAY_TIMEOUT; else echo 300000; ?>'; // in msec
  
         var logExecTime = <?php echo (LOG_EXEC_TIME === TRUE ? 'true' : 'false'); ?>;
  
@@ -166,15 +167,23 @@
         Ext.onReady(function () { 
             //TODO update jobsStatus onLogin             
             Ext.Ajax.extraParams = {sessionID : sessionID};
-            Ext.Ajax.timeout = 600000;
-            Ext.Ajax.on('requestexception', function(conn, response, options, e) {                   
+            Ext.Ajax.timeout = gatewayTimeout; // msec ; should be the same value (or less) as gateway timeout
+
+            Ext.Ajax.on('requestexception', function(conn, response, options, e) { 
+
                 if (loadMask && loadMask.isMasked())
                     loadMask.hide();
-               if (response && response.statusText)
-                    myDesktopApp.errorMsg(response.statusText);
+                    
+                if (response && response.statusText) {
+                    if (response.timedout) 
+                        myDesktopApp.errorMsg('Request processing time exceeds gateway timeout.<br/>In case of parameter from Remote Bases : please re-launch the same request in 10 min,<br/>otherwise contact AMDA team');
+                    else 
+                        myDesktopApp.errorMsg(response.statusText);
+                }
                 else
                     myDesktopApp.errorMsg('Communication failure');
                 });
+           
             // backspace key disable           
             Ext.EventManager.on(window, 'keydown', function(e, t) {
                 if (e.getKey() == e.BACKSPACE && ((!/^input$/i.test(t.tagName) && !/^textarea$/i.test(t.tagName)) || t.disabled || t.readOnly)) {
@@ -57,10 +57,10 @@ Ext.define(&#39;amdaModel.ExecutableNode&#39;, {
  
 				//AKKA - Rework of the result treatment for the integration with the new kernel
 				if (!e.status){
-					myDesktopApp.errorMsg('Internal error during request');
+				//	myDesktopApp.errorMsg('Internal error during request');
 					return;
 				}
-     	   
+
 				if (!res.success){
 					myDesktopApp.errorMsg(res.message);
 					return;