Robert Brewer avatar Robert Brewer committed 168d5c6

1. Partial fix for ticket #245 (stop method is never called when sending a signal). autoreload is still vulnerable.
2. New retry scheme for NotReady errors. Some systems were raising NotReady on the test suite.

Comments (0)

Files changed (1)

cherrypy/server.py

     # Start the http server. This must be done after check_port, above.
     cherrypy._httpserver = serverClass()
     try:
-        cherrypy._appserver_state = 1
-        cherrypy._httpserver.start()
-    except (KeyboardInterrupt, SystemExit):
+        try:
+            cherrypy._appserver_state = 1
+            # This should block until the http server stops.
+            cherrypy._httpserver.start()
+        except (KeyboardInterrupt, SystemExit):
+            pass
+    finally:
         cherrypy.log("<Ctrl-C> hit: shutting down", "HTTP")
         stop()
 
     """
     if cherrypy._appserver_state == 0:
         raise cherrypy.NotReady("No thread has called cherrypy.server.start().")
-    elif cherrypy._appserver_state == None:
-        raise cherrypy.NotReady("cherrypy.server.start() encountered errors.")
+    
+    trials = 0
+    while cherrypy._appserver_state == None:
+        # Give the server thread time to complete.
+        trials += 1
+        if trials > 10:
+            raise cherrypy.NotReady("cherrypy.server.start() encountered errors.")
+        time.sleep(1)
     
     threadID = threading._get_ident()
     if threadID not in seen_threads:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.