[z3-checkins] r44440 - z3/deliverance/DeliveranceVHoster/trunk/dvhoster

[ltucker at codespeak.net]

Author: ltucker
Date: Fri Jun 22 21:37:44 2007
New Revision: 44440

Modified:
   z3/deliverance/DeliveranceVHoster/trunk/dvhoster/dispatcher.py
Log:
added flag to enable/disable transcluder

Modified: z3/deliverance/DeliveranceVHoster/trunk/dvhoster/dispatcher.py
==============================================================================
--- z3/deliverance/DeliveranceVHoster/trunk/dvhoster/dispatcher.py	(original)
+++ z3/deliverance/DeliveranceVHoster/trunk/dvhoster/dispatcher.py	Fri Jun 22 21:37:44 2007
@@ -67,6 +67,7 @@
         self.logger = logger
 
         # transcluder configuration 
+	self.transcluder_enabled = asbool(app_conf.get('transcluder_enabled',False))
         ok_hosts = app_conf.get('transcluder_ok_hosts')
 
         if not ok_hosts or ok_hosts == 'all':
@@ -165,11 +166,12 @@
             remote=remote_uri,
             force_host=True)
 
-        app = TranscluderMiddleware(app,
-                                    deptracker=self.transcluder_deptracker,
-                                    tasklist=self.transcluder_pool,
-                                    include_predicate=self.transcluder_ok_hosts,
-                                    recursion_predicate=self.transcluder_ok_hosts)
+        if self.transcluder_enabled: 
+            app = TranscluderMiddleware(app,
+                                        deptracker=self.transcluder_deptracker,
+                                        tasklist=self.transcluder_pool,
+                                        include_predicate=self.transcluder_ok_hosts,
+                                        recursion_predicate=self.transcluder_ok_hosts)
         
         if should_theme_uri:
             if self.rewrite_links: