Changeset 408

Timestamp:

07/05/05 16:18:59

Author:

mikerobi

Message:

Default filters are now initilized when the server is started. This allows access to configuration data from within init methods.

Files:

• trunk/cherrypy/_cputil.py (modified) (2 diffs)
• trunk/cherrypy/config.py (modified) (1 diff)
• trunk/cherrypy/lib/filter/sessionfilter/__init__.py (modified) (1 diff)
• trunk/cherrypy/lib/filter/sessionfilter/sessionconfig.py (modified) (1 diff)
• trunk/cherrypy/server.py (modified) (2 diffs)
• trunk/cherrypy/test/test.py (modified) (1 diff)

trunk/cherrypy/_cputil.py

@@ -148 +148 @@
-    decodingfilter, encodingfilter, gzipfilter, logdebuginfofilter, \
-    staticfilter, nsgmlsfilter, tidyfilter, \
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-# These are in order for a reason!
-
-cpDefaultInputFilterList
-_cachefilter
-_logdebuginfofilter
-virtualhostfilter.VirtualHostFilter()
-baseurlfilter.BaseUrlFilter()
-decodingfilter.DecodingFilter()
-_sessionfilter
-sessionauthenticatefilter.SessionAuthenticateFilter()
-staticfilter.StaticFilter()
-_nsgmlsfilter
-_tidyfilter
-_xmlfilter
+
+_cpDefaultInputFilters
+'CacheFilter'
+'LogDebugInfoFilter'
+'VirtualHostFilter'
+'BaseUrlFilter'
+'DecodingFilter'
+'SessionFilter'
+'SessionAuthenticateFilter'
+'StaticFilter'
+'NsgmlsFilter'
+'TidyFilter'
+'XmlRpcFilter'
-]
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-]
+
+# these are the lists cp internally uses to access the filters
+# they are populated when _cpInitDefaultFilters is called
+_cpDefaultInputFilterList  = []
+_cpDefaultOutputFilterList = []
+
+# initilize the default filters
+def _cpInitDefaultFilters():
+    global _cpDefaultInputFilterList, _cpDefaultOutputFilterList
+    _cpDefaultInputFilterList  = []
+    _cpDefaultOutputFilterList = []
+
+    for filterName in __cpDefaultInputFilters:
+        filterClass = _cpDefaultFilterClasses[filterName]
+        filterInstance = _cpDefaultFilterInstances.setdefault(filterName, filterClass())
+        _cpDefaultInputFilterList.append(filterInstance)
+    
+    for filterName in __cpDefaultOutputFilters:
+        filterClass = _cpDefaultFilterClasses[filterName]
+        filterInstance = _cpDefaultFilterInstances.setdefault(filterName, filterClass())
+        _cpDefaultOutputFilterList.append(filterInstance)
-
-# public domain "unrepr" implementation, found on the web and then improved.
@@ -195 +232 @@
-class UnknownType(Exception):
-    pass
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-class Builder:
-

trunk/cherrypy/config.py

@@ -55 +55 @@
-    'server.reverseDNS': False,
-    'server.threadPool': 0,
-
-    'sessionFilter.on' : False,
-    'sessionFilter.sessionList' : ['default'],
-    'sessionFIlter.storageAdaptors' : {},
-    'sessionFilter.default.on': True,
-    'sessionFilter.default.timeout': 60,
-    'sessionFilter.default.cleanUpDelay': 60,
-    'sessionFilter.default.storageType' : 'ram',
-    'sessionFilter.default.cookiePrefix': 'CherryPySession',
-    'sessionFilter.default.storagePath': '.sessiondata'
-    }
-

trunk/cherrypy/lib/filter/sessionfilter/__init__.py

@@ -36 +36 @@
-        except ImportError:
-            from cherrypy._cpthreadinglocal import local
-
+
-        # Create as sessions object for accessing session data
-        cherrypy.sessions = local()
-
-        self.sessionManagers = {}
+        cherrypy.config.update({'global' : sessionconfig._sessionDefaults})
-
-

trunk/cherrypy/lib/filter/sessionfilter/sessionconfig.py

@@ -29 +29 @@
-import cherrypy
-
+# these get copied to the configMap when the filter
+# is initilized
+_sessionDefaults = {
+    'sessionFilter.on' : False,
+    'sessionFilter.sessionList' : ['default'],
+    'sessionFIlter.storageAdaptors' : {},
+    'sessionFilter.default.on': True,
+    'sessionFilter.default.timeout': 60,
+    'sessionFilter.default.cleanUpDelay': 60,
+    'sessionFilter.default.storageType' : 'ram',
+    'sessionFilter.default.cookiePrefix': 'CherryPySession',
+    'sessionFilter.default.storagePath': '.sessiondata'
+}
-
-def retrieve(keyName, sessionName, default = None):

trunk/cherrypy/server.py

@@ -65 +65 @@
-            - create response and request objects
-            - starts a server
+            - initilizes built in filters
-    """
-    
@@ -102 +103 @@
-    else:
-        cherrypy.profiler = None
+
+    # Initilize the built in filters
+    cherrypy._cputil._cpInitDefaultFilters()
-    
-    if initOnly:

trunk/cherrypy/test/test.py

@@ -187 +187 @@
-            cherrypy.config.reset()
-            cherrypy.config.update({'global': server_conf.copy()})
+            cherrypy._cputil._cpInitDefaultFilters()
-            suite = CPTestLoader.loadTestsFromName(testmod)
-            CPTestRunner(verbosity=2).run(suite)