Changeset 1435

Timestamp:

11/18/06 13:19:39

Author:

fumanchu

Message:

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

Files:

• trunk/cherrypy/lib/sessions.py (modified) (3 diffs)

trunk/cherrypy/lib/sessions.py

@@ -21 +21 @@
-import cherrypy
-from cherrypy.lib import http
+
+
+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)
-
-
@@ -53 +63 @@
-                self.id = None
-    
-    def clean_cycle(self):
-        """Clean up expired sessions at regular intervals."""
-        # clean_thread is both a cancelable Timer and a flag.
-        if self.clean_thread:
-            self.clean_up()
-            t = threading.Timer(self.clean_freq, self.clean_cycle)
-            self.__class__.clean_thread = t
-            t.start()
-    
-    def clean_interrupt(cls):
-cycle
+timer
-        if cls.clean_thread:
-            cls.clean_thread.cancel()
+            cls.clean_thread.join()
-            cls.clean_thread = None
-    clean_interrupt = classmethod(clean_interrupt)
@@ -111 +113 @@
-        self.loaded = True
-        
+        # Stick the clean_thread in the class, not the instance.
+        # The instances are created and destroyed per-request.
-        cls = self.__class__
-        if not cls.clean_thread:
-            cherrypy.engine.on_stop_engine_list.append(cls.clean_interrupt)
-
-
-
-
+
+
+
+
+
-            t.start()
-