Merge lp:~anybox/openobject-client-web/bad-cherrypy-warning into lp:openobject-client-web

[Christophe Combelles]

Merge related to https://bugs.launchpad.net/openobject-client-web/+bug/705312/

When using cherrypy 3.1 and a reverse proxy, we get 408 and 502 errors very often, unless disabling keepalive in the apache config, or raising the default socket_timeout in cherrypy. This is a bug in cherrypy as documented in the bug report, which should be solved in cherrypy 3.1.3.

In the meantime, when this problem occurs, ajax requests fail silently, thus leading to bizarre behaviours:
- missing menuitems
- ir.ui.menu view opening instead of the wanted view.

I have :

1) added an ajaxError handler to catch these errors and display a jquery fancybox with the error code.
2) raised the socket_timeout to 60s in the default config

I've used jQuery to send the ajaxError signal because Mochikit doesn't want to sent it.

Unmerged revisions

4725. By Christophe Combelles on 2011-11-01

[FIX] Don't fail silently if an ajax request fails. It leads to un predictable
behaviour (missing menuitems, wrong view opened). Display an error popup
instead. This happens very often with cherrypy 3.1 and a reverse proxy. It will
help people diagnosing https://bugs.launchpad.net/bugs/705312 more quickly
The related problem should disappear with cherrypy >= 3.1.3

=== modified file 'addons/openerp/static/javascript/openerp/openerp.base.js'
--- addons/openerp/static/javascript/openerp/openerp.base.js	2011-08-11 06:14:03 +0000
+++ addons/openerp/static/javascript/openerp/openerp.base.js	2011-11-02 00:19:26 +0000
@@ -52,11 +52,14 @@
         overlayOpacity: 0.7,
         scrolling: 'no'
     };
-    if(xhr.getResponseHeader('X-Maintenance-Error')) {
+    if(xhr.getResponseHeader && xhr.getResponseHeader('X-Maintenance-Error')) {
         options['autoDimensions'] = false;
         options['scrolling'] = 'auto';
+        msg = xhr.responseText;
+    } else if (xhr.message && xhr.number) {
+        msg = 'Unknown error ' + xhr.number + ': ' + xhr.message;
     }
-    jQuery.fancybox(xhr.responseText, options);
+    jQuery.fancybox(msg, options);
 }
 
 /**
@@ -69,15 +72,11 @@
 function loadingError(url) {
     return function (xhr) {
         if(url) { $.hash(url); }
-        switch (xhr.status) {
-            case 500:
-                displayErrorOverlay(xhr);
-                break;
-            case 401: // Redirect to login, probably
+        if (xhr.status == 401) { // Redirect to login, probably
                 window.location.assign(
                         xhr.getResponseHeader('Location'));
-                break;
-            default:
+	} else {
+                displayErrorOverlay(xhr);
                 if(window.console) {
                     console.warn("Failed to load ", xhr.url, ":", xhr.status, xhr.statusText);
                 }
@@ -376,5 +375,8 @@
         if(!concurrencyInfo) return;
         updateConcurrencyInfo(jQuery.parseJSON(concurrencyInfo));
 
+    },
+    ajaxError: function (e, xhr) {
+        loadingError(e.currentTarget.URL)(xhr)
     }
 });

=== modified file 'doc/openerp-web.cfg'
--- doc/openerp-web.cfg	2011-06-22 09:35:20 +0000
+++ doc/openerp-web.cfg	2011-11-02 00:19:26 +0000
@@ -4,6 +4,7 @@
 # Some server parameters that you may want to tweak
 server.socket_host = "0.0.0.0"
 server.socket_port = 8080
+server.socket_timeout = 60
 
 # Sets the number of threads the server uses
 server.thread_pool = 10

=== modified file 'openobject/static/javascript/openobject/openobject.http.js'
--- openobject/static/javascript/openobject/openobject.http.js	2011-07-08 10:54:52 +0000
+++ openobject/static/javascript/openobject/openobject.http.js	2011-11-02 00:19:26 +0000
@@ -37,6 +37,10 @@
         
         return req.addBoth(function(xmlHttp){
             openobject.http.AJAX_COUNT -= 1;
+            if (xmlHttp.status === undefined) {
+                // Use jquery, as Mochikit signal ajaxError doesn't work
+		$.event.trigger("ajaxError", xmlHttp);
+            }
             if (openobject.http.AJAX_COUNT == 0) {
                 MochiKit.Signal.signal(window, "ajaxStop");
             }
@@ -69,6 +73,10 @@
         
         return req.addBoth(function(xmlHttp){
             openobject.http.AJAX_COUNT -= 1;
+            if (xmlHttp.status === undefined) {
+                // Use jquery, as Mochikit signal ajaxError doesn't work
+		$.event.trigger("ajaxError", xmlHttp);
+            }
             if (openobject.http.AJAX_COUNT == 0) {
                 MochiKit.Signal.signal(window, "ajaxStop");
             }