Changeset 106

Timestamp:

08/18/06 17:16:00

Author:

fumanchu

Message:

modpython_gateway: fixed bug in cleanup and added a "wsgi.startup" PythonOption? that works similarly (but gets passed the request object).

Files:

• modpython_gateway.py (modified) (2 diffs)

modpython_gateway.py

@@ -171 +171 @@
-
-
+startup = None
-cleanup = None
-
-def handler(req):
+    # Run a startup function if requested.
+    global startup
+    if not startup:
+        func = req.get_options().get('wsgi.startup')
+        if func:
+            module_name, object_str = func.split('::', 1)
+            module = __import__(module_name, globals(), locals(), [''])
+            startup = apache.resolve_object(module, object_str)
+            startup(req)
+    
-    # Register a cleanup function if requested.
-    global cleanup
@@ -181 +192 @@
-            module_name, object_str = func.split('::', 1)
-            module = __import__(module_name, globals(), locals(), [''])
-object
+cleanup
-            def cleaner(data):
-object
+cleanup
-            try:
-                # apache.register_cleanup wasn't available until 3.1.4.