Changeset 889

Timestamp:

12/28/05 17:05:53

Author:

fumanchu

Message:

server.wait now checks for server.interrupt, so start_with_callback won't hang on error in server.start.

Files:

• trunk/cherrypy/_cpserver.py (modified) (3 diffs)

trunk/cherrypy/_cpserver.py

@@ -2 +2 @@
-
-import cgi
+import sys
-import threading
-import time
@@ -111 +112 @@
-            cherrypy.log("SystemExit raised: shutting down server", "HTTP")
-            self.stop()
+        except:
+            # Don't bother logging, since we're going to re-raise.
+            self.interrupt = sys.exc_info()[1]
+            self.stop()
+            raise
-    
-    def start_http_server(self, blocking=True):
@@ -233 +239 @@
-    
-    def wait(self):
-
+ (or error)
-        while not self.ready:
-            time.sleep(.1)
+            if self.interrupt:
+                # Something went wrong in server.start,
+                # possibly in another thread. Stop this thread.
+                raise cherrypy.NotReady("The CherryPy server errored", "HTTP")
-    
-    def _is_ready(self):
-        return bool(self.state == STARTED)
-
+
+
-    
-    def start_with_callback(self, func, args=None, kwargs=None,