Changeset 493

Timestamp:

07/22/05 04:11:18

Author:

fumanchu

Message:

1. Builtin HTTP servers now check for free port.
2. Bugfix in covercp (had bad data if server restarted between requests).

Files:

• trunk/cherrypy/lib/covercp.py (modified) (1 diff)
• trunk/cherrypy/server.py (modified) (2 diffs)

trunk/cherrypy/lib/covercp.py

@@ -146 +146 @@
-        import cherrypy
-        cherrypy.response.headerMap['Content-Type'] = 'text/plain'
+        coverage.get_ready()
-        filename, statements, excluded, missing, _ = coverage.analysis2(name)
-        return self.annotated_file(filename, statements, excluded, missing)

trunk/cherrypy/server.py

@@ -118 +118 @@
-        run_server(serverClass)
-
+def check_port(host, port):
+    """Raise an error if the given port is not free on the given host."""
+    
+    import socket
+    try:
+        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        s.connect((host, int(port)))
+        s.close()
+        raise IOError("Port %s is in use on %s; perhaps the previous "
+                      "server did not shut down properly." % (port, host))
+    except socket.error:
+        pass
+
-def run_server(serverClass=None):
-    """Prepare the requested server and then run it."""
@@ -134 +147 @@
-        serverClass = _cpwsgi.WSGIServer
-    
-    cherrypy._httpserver = serverClass()
-    
-    if cherrypy.config.get('server', 'socketPort'):
-
-
-
+
+
+
+
-    else:
-        onWhat = "socket file: %s" % cherrypy.config.get('server.socketFile')
-    cherrypy.log("Serving HTTP on %s" % onWhat, 'HTTP')
-    
-
+
+
-    try:
-        cherrypy._appserver_state = 1