Changeset 1869

Timestamp:

01/18/08 18:00:02

Author:

fumanchu

Message:

Added a warning and auto-exit on main thread exit if the Bus is not shut down. This will help avoid issues like #750.

Files:

• trunk/cherrypy/restsrv/wspbus.py (modified) (3 diffs)

trunk/cherrypy/restsrv/wspbus.py

@@ -61 +61 @@
-"""
-
+import atexit
-import os
-try:
@@ -70 +71 @@
-import time
-import traceback as _traceback
+import warnings
-
-
@@ -159 +161 @@
-        return output
-    
+    def _clean_exit(self):
+        """An atexit handler which asserts the Bus is not running."""
+        if self.state != states.EXITING:
+            warnings.warn(
+                "The main thread is exiting, but the Bus is in the %r state; "
+                "shutting it down automatically now. You must either call "
+                "bus.block() after start(), or call bus.exit() before the "
+                "main thread exits." % self.state, RuntimeWarning)
+            self.exit()
+    
-    def start(self):
-        """Start all services."""
+        atexit.register(self._clean_exit)
+        
-        self.state = states.STARTING
-        self.log('Bus STARTING')