odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] web: avoid calling db_monodb at each request. This is a performance killer. Handle the case of non-existing database at router building. 

bzr revid: chs@openerp.com-20131118172304-a54lgu6dm865k8xf
This commit is contained in:
Christophe Simonis 2013-11-18 18:23:04 +01:00
parent 7c9be80f95
commit 07c80735df
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
addons/web/http.py
View File

@ -867,7 +867,7 @@ class Root(object):
self.statics = {}
self.db_routers = {}
self.db_routers_lock = threading.Lock()
self.db_routers_lock = threading.RLock()
self.load_addons()
@ -905,8 +905,6 @@ class Root(object):
else:
httprequest.session = self.session_store.get(sid)
self._find_db(httprequest)
if not "lang" in httprequest.session.context:
lang = httprequest.accept_languages.best or "en_US"
lang = babel.core.LOCALE_ALIASES.get(lang, lang).replace('-', '_')
@ -919,7 +917,7 @@ class Root(object):
updated = openerp.modules.registry.RegistryManager.check_registry_signaling(db)
if updated:
with self.db_routers_lock:
del self.db_routers[db]
self.db_routers.pop(db, None)
with set_request(request):
self.find_handler()
@ -943,12 +941,6 @@ class Root(object):
except werkzeug.exceptions.HTTPException, e:
return e(environ, start_response)
def _find_db(self, httprequest):
db = db_monodb(httprequest)
if db != httprequest.session.db:
httprequest.session.logout()
httprequest.session.db = db
def _build_request(self, httprequest):
if httprequest.args.get('jsonp'):
return JsonRequest(httprequest)
@ -983,7 +975,7 @@ class Root(object):
self.dispatch = DisableCacheMiddleware(app)
def _build_router(self, db):
_logger.info("Generating routing configuration for database %s" % db)
_logger.info("Generating routing configuration for database %s", db)
routing_map = routing.Map()
def gen(modules, nodb_only):
@ -1031,10 +1023,15 @@ class Root(object):
def get_db_router(self, db):
with self.db_routers_lock:
router = self.db_routers.get(db)
if not router:
router = self._build_router(db)
with self.db_routers_lock:
self.db_routers[db] = router
if not router:
try:
self.db_routers[db] = router = self._build_router(db)
except Exception:
_logger.exception('Cannot build router for database %s', db)
if not db:
raise
request.httprequest.session.logout()
return self.get_db_router(None)
return router
def find_handler(self):