Merge lp:~kangol/openobject-client-web/trunk-fix-templatelookup into lp:openobject-client-web/trunk

[Christophe Simonis (OpenERP)]

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Are you sure the template management stuff is going to work correctly when the pooler is restarted? It doesn't look cleaned up does it? Shouldn't we store our TemplateLookup instances in the pooler?

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Also I'm pretty sure this code used to use Mako's cache once upon a time, maybe check why this was replaced by a hand-rolled in-memory cache (and one working at a different level as well, doesn't mako cache the generated python code? Won't we have severe conflicts in case of multi-db situations?)

[Christophe Simonis (OpenERP) (kangol)]

On 02 Nov 2010, at 13:11, Xavier (Open ERP) wrote:

> Are you sure the template management stuff is going to work correctly when the pooler is restarted?
Good catch.
> It doesn't look cleaned up does it?
I don't think so.
> Shouldn't we store our TemplateLookup instances in the pooler?
Not needed. Beside the fact that the login page doesn't have a pooler (but need a TemplateLookup), just poping the right key out of the cache when restarting the pooler is enough
> --
> https://code.launchpad.net/~kangol/openobject-client-web/trunk-fix-templatelookup/+merge/39837
> You are the owner of lp:~kangol/openobject-client-web/trunk-fix-templatelookup.

[Christophe Simonis (OpenERP) (kangol)]

On 02 Nov 2010, at 13:11, Xavier (Open ERP) wrote:

> Also I'm pretty sure this code used to use Mako's cache once upon a time, maybe check why this was replaced by a hand-rolled in-memory cache (and one working at a different level as well, doesn't mako cache the generated python code? Won't we have severe conflicts in case of multi-db situations?)
No problems about the mako cache.
> --
> https://code.launchpad.net/~kangol/openobject-client-web/trunk-fix-templatelookup/+merge/39837
> You are the owner of lp:~kangol/openobject-client-web/trunk-fix-templatelookup.

[lp:~kangol/openobject-client-web/trunk-fix-templatelookup]

3775. By Christophe Simonis (OpenERP) on 2010-11-03

[FIX] remove db TemplateLookup from cache when restarting the pooler

=== modified file 'openobject/pooler.py'
--- openobject/pooler.py	2010-10-21 10:32:40 +0000
+++ openobject/pooler.py	2010-11-03 10:21:27 +0000
@@ -63,15 +63,17 @@
 def restart_pool():
 
     db_name = cherrypy.session['db']
-    
+
     if db_name in pool_dict:
         import addons
-        
+        import tools._expose
+
         del pool_dict[db_name]
         del addons._loaded[db_name]
-    
+        tools._expose._template_lookups.pop(db_name, None)
+
     return get_pool()
-        
+
 def get_pool():
 
     config = cherrypy.request.app.config
@@ -88,7 +90,7 @@
         import addons
 
         pool = pool_dict[db_name] = Pool()
-        
+
         try:
             addons.load_addons(db_name, config)
         except:

=== modified file 'openobject/tools/_expose.py'
--- openobject/tools/_expose.py	2010-10-28 14:21:03 +0000
+++ openobject/tools/_expose.py	2010-11-03 10:21:27 +0000
@@ -52,22 +52,26 @@
 filters = ["__content"]
 imports = ["from openobject.tools import content as __content"]
 
-class TL(TemplateLookup):
-
-    cache = {}
-
-    def get_template(self, uri):
-        try:
-            return self.cache[str(uri)]
-        except Exception, e:
-            pass
-        self.cache[str(uri)] = res = super(TL, self).get_template(uri)
-        return res
-
-template_lookup = TL(directories=[paths.root(), paths.addons()],
-                     default_filters=filters,
-                     imports=imports,
-                     preprocessor=templating.edition_preprocessor)
+_template_lookups = {}      # XXX use mako.util.LRUCache ?
+
+def get_template_lookup():
+    """Return the Template Lookup for the current database"""
+    db_name = None
+    try:
+        db_name = cherrypy.session['db']
+    except (AttributeError, KeyError):
+        pass
+
+    try:
+        return _template_lookups[db_name]
+    except KeyError:
+        lookup = _template_lookups[db_name] = TemplateLookup(
+                                 directories=[paths.root(), paths.addons()],
+                                 default_filters=filters,
+                                 imports=imports,
+                                 preprocessor=templating.edition_preprocessor)
+        return lookup
+
 
 def load_template(template):
 
@@ -75,7 +79,7 @@
         return template
 
     if re.match('(.+)\.(html|mako)\s*$', template):
-        return template_lookup.get_template(template)
+        return get_template_lookup().get_template(template)
     else:
         return Template(template, default_filters=filters, imports=imports)