Changeset 1251

Timestamp:

08/18/06 17:23:09

Author:

fumanchu

Message:

Moved some Apache control code from benchmark to _cpmodpy, where it can be more useful.

Files:

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

trunk/cherrypy/_cpmodpy.py

@@ -1 +1 @@
-"""Native adapter for serving CherryPy via mod_python"""
-
-from mod_python import apache
-import cherrypy
-from cherrypy._cperror import format_exc, bare_error
-from cherrypy.lib import http
+
+
+
+# ------------------------------ Request-handling
-
-
@@ -26 +29 @@
-        cherrypy.engine.stop()
-    try:
+        from mod_python import apache
-        # apache.register_cleanup wasn't available until 3.1.4.
-        apache.register_cleanup(cherrypy_cleanup)
@@ -41 +45 @@
-_isSetUp = False
-def handler(req):
+    from mod_python import apache
-    try:
-        global _isSetUp
@@ -120 +125 @@
-            req.write(seg)
-
+
+
+# --------------- Startup tools for CherryPy + mod_python --------------- #
+
+
+import os
+import re
+
+
+def read_process(cmd, args=""):
+    pipein, pipeout = os.popen4("%s %s" % (cmd, args))
+    try:
+        firstline = pipeout.readline()
+        if (re.search(r"(not recognized|No such file|not found)", firstline,
+                      re.IGNORECASE)):
+            raise IOError('%s must be on your system path.' % cmd)
+        output = firstline + pipeout.read()
+    finally:
+        pipeout.close()
+    return output
+
+
+class ModPythonServer(object):
+    
+    template = """
+# Apache2 server configuration file for running CherryPy with mod_python.
+
+DocumentRoot "/"
+Listen %(port)s
+LoadModule python_module modules/mod_python.so
+
+<Location %(loc)s>
+    SetHandler python-program
+    PythonHandler %(handler)s
+    PythonDebug On
+%(opts)s
+</Location>
+"""
+    
+    def __init__(self, loc="/", port=80, opts=None, apache_path="apache",
+                 handler="cherrypy._cpmodpy::handler"):
+        self.loc = loc
+        self.port = port
+        self.opts = opts
+        self.apache_path = apache_path
+        self.handler = handler
+    
+    def start(self):
+        opts = "".join(["    PythonOption %s %s\n" % (k, v)
+                        for k, v in self.opts])
+        conf_data = self.template % {"port": self.port,
+                                     "loc": self.loc,
+                                     "opts": opts,
+                                     "handler": self.handler,
+                                     }
+        
+        mpconf = os.path.join(os.path.dirname(__file__), "cpmodpy.conf")
+        f = open(mpconf, 'wb')
+        try:
+            f.write(conf_data)
+        finally:
+            f.close()
+        
+        response = read_process(self.apache_path, "-k start -f %s" % mpconf)
+        self.ready = True
+        return response
+    
+    def stop(self):
+        os.popen("apache -k stop")
+        self.ready = False
+

trunk/cherrypy/test/benchmark.py

@@ -32 +32 @@
-
-import cherrypy
+from cherrypy import _cpmodpy
-from cherrypy.lib import http
-
-
-AB_PATH = ""
-
+apache
-SCRIPT_NAME = "/cpbench/users/rdelon/apps/blog"
-
- 'read_process',
+
-           'run_standard_benchmarks', 'safe_threads',
-           'size_report', 'startup', 'thread_report',
@@ -101 +102 @@
-class NullResponse:
-    pass
-
-
-def read_process(cmd, args=""):
-    pipein, pipeout = os.popen4("%s %s" % (cmd, args))
-    try:
-        firstline = pipeout.readline()
-        if (re.search(r"(not recognized|No such file|not found)", firstline,
-                      re.IGNORECASE)):
-            raise IOError('%s must be on your system path.' % cmd)
-        output = firstline + pipeout.read()
-    finally:
-        pipeout.close()
-    return output
-
-
@@ -202 +190 @@
-    def run(self):
-        # Parse output of ab, setting attributes on self
-
+_cpmodpy.
-        for attr, name, pattern in self.parse_patterns:
-            val = re.search(pattern, self.output, re.MULTILINE)
@@ -273 +261 @@
-    """Start the CherryPy app server in 'serverless' mode (for modpython/WSGI)."""
-    if cherrypy.engine.state == cherrypy._cpengine.STOPPED:
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        cherrypy.engine.start(blocking=False)
-    if cherrypy.engine.state == cherrypy._cpengine.STARTING:
@@ -285 +274 @@
-    return 0 # apache.OK
-
-mp_conf_template = """
-# Apache2 server configuration file for benchmarking CherryPy with mod_python.
-
-DocumentRoot "/"
-Listen 8080
-LoadModule python_module modules/mod_python.so
-
-<Location />
-    SetHandler python-program
-    PythonFixupHandler cherrypy.test.benchmark::startup_modpython
-    PythonHandler modpython_gateway::handler
-    PythonOption wsgi.application cherrypy::tree
-    PythonDebug On
-%s%s
-</Location>
-"""
-
-cpmodpy_template = """
-# Apache2 server configuration file for benchmarking CherryPy with mod_python.
-
-DocumentRoot "/"
-Listen 8080
-LoadModule python_module modules/mod_python.so
-
-<Location />
-    SetHandler python-program
-    PythonHandler cherrypy._cpmodpy::handler
-    PythonOption cherrypy.setup cherrypy.test.benchmark::startup_modpython
-    PythonDebug On
-%s%s
-</Location>
-"""
-
-def run_modpython(use_wsgi=False):
+    print "Starting mod_python..."
+    pyopts = []
+    
-    # Pass the null and ab=path options through Apache
-    nullreq_opt = ""
-    if "--null" in opts:
-
-
-
+
+
-    if "--ab" in opts:
-
-
+
+
+
-    if use_wsgi:
-
+
+
+
+
-    else:
-
-
-
-
+
+
+
-    try:
-
-
-
-
-
-
-
+
-        run()
-    finally:
-os.popen("apache -k stop"
+s.stop(
-
-