New Engine.reexec_retry (timeout in seconds) for os.execv call.

1 files changed, 8 insertions, 2 deletions

diff --git a/cherrypy/_cpengine.py b/cherrypy/_cpengine.py
index 9d8912e7..dd59feee 100644
--- a/cherrypy/_cpengine.py
+++ b/cherrypy/_cpengine.py
@@ -126,13 +126,19 @@ class Engine(object):
         
         # Some platforms (OS X) will error if all threads are not
         # ABSOLUTELY terminated. See http://www.cherrypy.org/ticket/581.
-        while True:
+        for trial in xrange(self.reexec_retry * 10):
             try:
                 os.execv(sys.executable, args)
-                break
+                return
             except OSError, x:
                 if x.errno != 45:
                     raise
+                time.sleep(0.1)
+        else:
+            raise
+    
+    # Number of seconds to retry reexec if os.execv fails.
+    reexec_retry = 2
     
     def autoreload(self):
         """Reload the process if registered files have been modified."""