[icinga-checkins] icinga.org: icinga-web/master: * Global ajax timeout fix (for heavy load)

git at icinga.org git at icinga.org
Wed Jan 26 17:53:21 CET 2011


Module: icinga-web
Branch: master
Commit: 10f83cd411d27dcfd2c6fada4817d302838053b4
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=10f83cd411d27dcfd2c6fada4817d302838053b4

Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Jan 26 14:57:43 2011 +0100

* Global ajax timeout fix (for heavy load)

---

 app/modules/AppKit/config/module.xml               |    5 ++++-
 app/modules/AppKit/templates/Ext/HeaderSuccess.php |    3 +++
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/app/modules/AppKit/config/module.xml b/app/modules/AppKit/config/module.xml
index aabf8fe..fd81af2 100755
--- a/app/modules/AppKit/config/module.xml
+++ b/app/modules/AppKit/config/module.xml
@@ -55,6 +55,9 @@
 					<ae:parameter name="org.icinga.errorNotificationsEnabled">true</ae:parameter>
 					<ae:parameter name="org.icinga.autoRefresh">true</ae:parameter>
 				</setting>
+				
+				<!-- Ajax default request timeout (ms), 4 minutes == 240000 -->
+				<setting name="ajax.timeout">240000</setting>
 
 				<!-- Adding styles -->
 				<setting name="appkit_module.app.css_files">
@@ -100,7 +103,7 @@
 <!--				<setting name="appkit_module.app.javascript_dynamic"></setting>-->
 
 				<setting name="appkit_module.app.meta_tags">
-					<ae:parameter name="author">(c) 2009,2010 Icinga developer team - www.icinga.org</ae:parameter>
+					<ae:parameter name="author">(c) 2009-2011 Icinga developer team - www.icinga.org</ae:parameter>
 					<ae:parameter name="robots">noindex</ae:parameter>
 				</setting>
 
diff --git a/app/modules/AppKit/templates/Ext/HeaderSuccess.php b/app/modules/AppKit/templates/Ext/HeaderSuccess.php
index 50647e8..49f8966 100755
--- a/app/modules/AppKit/templates/Ext/HeaderSuccess.php
+++ b/app/modules/AppKit/templates/Ext/HeaderSuccess.php
@@ -24,6 +24,9 @@ Ext.onReady(function() {
 	});
 	<?php } ?>
 	
+	// Default ajax timeout
+	Ext.Ajax.timeout = Number(<?php echo AgaviConfig::get('modules.appkit.ajax.timeout', 120000); ?>);
+	
 	var UserMenu = (function() {
 	    var pub = {};
 	    var _LA = AppKit.util.Layout;





More information about the icinga-checkins mailing list