Changeset 1231

Timestamp:

08/09/06 18:50:46

Author:

fumanchu

Message:

New deadlock monitor which sets Response.timed_out to True if Response.time < now - config.get("deadlock_timeout"). The request thread periodically checkes Response.timed_out and raises TimeoutError? if it is True. Current checks are in HookMap?.run, Request.respond, Body.set, and Response.finalize, more can be added later if needed.

Files:

• trunk/cherrypy/__init__.py (modified) (1 diff)
• trunk/cherrypy/_cpengine.py (modified) (5 diffs)
• trunk/cherrypy/_cperror.py (modified) (1 diff)
• trunk/cherrypy/_cprequest.py (modified) (8 diffs)
• trunk/cherrypy/test/test_states.py (modified) (3 diffs)
• trunk/cherrypy/test/test_states_demo.py (modified) (1 diff)

trunk/cherrypy/__init__.py

@@ -5 +5 @@
-import logging as _logging
-
-
+
+
-import config
-

trunk/cherrypy/_cpengine.py

@@ -56 +56 @@
-        self.seen_threads = {}
-        
+        self.servings = []
+        
-        self.mtimes = {}
-        self.reload_files = []
@@ -71 +73 @@
-        for func in self.on_start_engine_list:
-            func()
+        
-        self.state = STARTED
+        
+        freq = float(cherrypy.config.get('deadlock_poll_freq', 60))
+        if freq > 0:
+            self.monitor_thread = threading.Timer(freq, self.monitor)
+            self.monitor_thread.start()
+        
-        if blocking:
-            self.block()
@@ -157 +166 @@
-                func()
-            
+            if self.monitor_thread:
+                self.monitor_thread.cancel()
+                self.monitor_thread = None
+            
-            self.state = STOPPED
-            cherrypy.log("CherryPy shut down", "ENGINE")
@@ -183 +196 @@
-        """
-        if self.state == STOPPED:
-
+eq
-        elif self.state == STARTING:
-
+eq
-        else:
-            # Only run on_start_thread_list if the engine is running.
@@ -195 +208 @@
-                for func in self.on_start_thread_list:
-                    func(i)
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    def start_with_callback(self, func, args=None, kwargs=None):

trunk/cherrypy/_cperror.py

@@ -201 +201 @@
-            path = cherrypy.request.path
-        self.args = (path,)
-
+
+
+
+
+
+
-
-

trunk/cherrypy/_cprequest.py

@@ -31 +31 @@
-    def run(self, point):
-        """Execute all registered callbacks for the given point."""
+        if cherrypy.response.timed_out:
+            raise cherrypy.TimeoutError()
+        
-        failsafe = point in self.failsafe
-        for callback in self.callbacks[point]:
@@ -108 +111 @@
-            self.closed = True
-            self.hooks.run('on_end_request')
+            
+            s = (self, cherrypy.serving.response)
+            try:
+                cherrypy.engine.servings.remove(s)
+            except ValueError:
+                pass
+            
-            cherrypy.serving.__dict__.clear()
-    
@@ -180 +190 @@
-        except (KeyboardInterrupt, SystemExit):
-            raise
+        except cherrypy.TimeoutError:
+            raise
-        except:
-            if cherrypy.config.get("throw_errors", False):
@@ -199 +211 @@
-        try:
-            try:
+                if cherrypy.response.timed_out:
+                    raise cherrypy.TimeoutError()
+                
-                self.hooks = HookMap(self.hookpoints)
-                self.hooks.failsafe = ['on_start_resource', 'on_end_resource',
@@ -595 +610 @@
-    
-    def __set__(self, obj, value):
+        if cherrypy.response.timed_out:
+            raise cherrypy.TimeoutError()
-        # Convert the given value to an iterable object.
-        if isinstance(value, types.FileType):
@@ -624 +641 @@
-    
-    # Class attributes for dev-time introspection.
-None
-None
+""
+[]
-    headers = http.HeaderMap()
-    simple_cookie = Cookie.SimpleCookie()
-    body = Body()
+    time = None
+    timed_out = False
-    
-    def __init__(self):
-        self.status = None
-        self.header_list = None
-body = None
+_body = []
-        self.time = time.time()
-        
@@ -653 +672 @@
-    def finalize(self):
-        """Transform headers (and cookies) into cherrypy.response.header_list."""
+        if self.timed_out:
+            raise cherrypy.TimeoutError()
-        
-        try:
@@ -686 +707 @@
-                name, value = line.split(": ", 1)
-                h.append((name, value))
+    
+    def check_timeout(self):
+        """If now > self.time + deadlock_timeout, set self.timed_out.
+        
+        This purposefully sets a flag, rather than raising an error,
+        so that a monitor thread can interrupt the Response thread.
+        """
+        timeout = float(cherrypy.config.get('deadlock_timeout', 300))
+        if time.time() > self.time + timeout:
+            self.timed_out = True
+

trunk/cherrypy/test/test_states.py

@@ -23 +23 @@
-        return "app was restarted succesfully"
-    restart.exposed = True
+    
+    def block_explicit(self):
+        while True:
+            if cherrypy.response.timed_out:
+                cherrypy.response.timed_out = False
+                return "broken!"
+            time.sleep(0.1)
+    block_explicit.exposed = True
+    
+    def block_implicit(self):
+        raise cherrypy.InternalRedirect("/block_implicit")
+    block_implicit.exposed = True
+    block_implicit._cp_config = {'recursive_redirect': True}
-
-cherrypy.tree.mount(Root())
@@ -28 +41 @@
-    'log_to_screen': False,
-    'environment': 'production',
+    'deadlock_poll_freq': 1,
+    'deadlock_timeout': 2,
-    })
-
@@ -183 +198 @@
-            self.assertEqual(len(db_connection.threads), 0)
-    
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if self.server_class:
-            demoscript = os.path.join(os.getcwd(), os.path.dirname(__file__),

trunk/cherrypy/test/test_states_demo.py

@@ -28 +28 @@
-                            })
-    cherrypy.quickstart(Root())
-
+