Changeset 1434

Timestamp:

11/18/06 12:44:48

Author:

fumanchu

Message:

Engine.stop was calling monitor_thread.cancel() but not .join(). Engine.monitor_thread is also now a PerpetualTimer?, so it keeps the same thread rather than spawning new ones on each run.

Files:

• trunk/cherrypy/_cpengine.py (modified) (4 diffs)

trunk/cherrypy/_cpengine.py

@@ -33 +33 @@
-
-
+class PerpetualTimer(threading._Timer):
+    
+    def run(self):
+        while True:
+            self.finished.wait(self.interval)
+            if self.finished.isSet():
+                return
+            self.function(*self.args, **self.kwargs)
+
+
-class Engine(object):
-    """Application interface for (HTTP) servers, plus process controls."""
@@ -72 +82 @@
-        freq = self.deadlock_poll_freq
-        if freq > 0:
-
+
+
-            self.monitor_thread.start()
-        
@@ -163 +174 @@
-            if self.monitor_thread:
-                self.monitor_thread.cancel()
+                self.monitor_thread.join()
-                self.monitor_thread = None
-            
@@ -212 +224 @@
-    
-    def monitor(self):
- (starts a recurring Timer thread)
+
-        if self.state == STARTED:
-            for req, resp in self.servings:
-                resp.check_timeout()
-        freq = self.deadlock_poll_freq
-        self.monitor_thread = threading.Timer(freq, self.monitor)
-        self.monitor_thread.start()
-    
-    def start_with_callback(self, func, args=None, kwargs=None):