Changeset 1939

Timestamp:

04/05/08 15:07:05

Author:

fumanchu

Message:

mod_python: send bus messages to the apache log, plus cherrypy.setup arg now can take a bare module to import (without having to call a ::function).

Files:

• trunk/cherrypy/_cpmodpy.py (modified) (5 diffs)

trunk/cherrypy/_cpmodpy.py

@@ -65 +65 @@
-"""
-
+import logging
-import StringIO
-
@@ -76 +77 @@
-
-
+
-def setup(req):
+    from mod_python import apache
+    
-    # Run any setup function defined by a "PythonOption cherrypy.setup" directive.
-    options = req.get_options()
-    if 'cherrypy.setup' in options:
-
-
-
-
+
+
+
+
+
+
+
+
-    
-    cherrypy.config.update({'log.screen': False,
@@ -90 +98 @@
-                            })
-    
+    cherrypy._console_control_handler.unsubscribe()
+    cherrypy.engine.autoreload.unsubscribe()
-    cherrypy.server.unsubscribe()
+    
+    def _log(msg, level):
+        newlevel = apache.APLOG_ERR
+        if logging.DEBUG >= level:
+            newlevel = apache.APLOG_DEBUG
+        elif logging.INFO >= level:
+            newlevel = apache.APLOG_INFO
+        elif logging.WARNING >= level:
+            newlevel = apache.APLOG_WARNING
+        # On Windows, req.server is required or the msg will vanish. See
+        # http://www.modpython.org/pipermail/mod_python/2003-October/014291.html.
+        # Also, "When server is not specified...LogLevel does not apply..."
+        apache.log_error(msg, newlevel, req.server)
+    cherrypy.engine.subscribe('log', _log)
+    
-    cherrypy.engine.start()
-    
@@ -96 +121 @@
-        cherrypy.engine.exit()
-    try:
-        from mod_python import apache
-        # apache.register_cleanup wasn't available until 3.1.4.
-        apache.register_cleanup(cherrypy_cleanup)
@@ -210 +234 @@
-    except:
-        tb = format_exc()
-
+, 'MOD_PYTHON', severity=logging.ERROR
-        s, h, b = bare_error()
-        send_response(req, s, h, b)