Changeset 1842

Timestamp:

01/12/08 23:07:38

Author:

fumanchu

Message:

Moved win32 console ctrl handler into a separate plugin, so that it's able to be disabled for those who 1) aren't working in a console, or 2) aren't using the Bus event loop.

Files:

• trunk/cherrypy/__init__.py (modified) (1 diff)
• trunk/cherrypy/restsrv/win32.py (modified) (2 diffs)

trunk/cherrypy/__init__.py

@@ -183 +183 @@
-    from cherrypy.restsrv import win32 as _restsrvwin
-    engine = _restsrvwin.Win32Bus()
+    _console_control_handler = _restsrvwin.ConsoleCtrlHandler(engine)
+    # If you don't want a ConsoleControlHandler,
+    # unsubscribe this before calling engine.start().
+    _console_control_handler.subscribe()
-except ImportError:
-    engine = restsrv.bus

trunk/cherrypy/restsrv/win32.py

@@ -9 +9 @@
-import win32serviceutil
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -16 +69 @@
-    
-    Instead of using time.sleep for blocking, this bus uses native
-
+ It also responds to console events.
-    """
-    
-    def __init__(self):
-        self.events = {}
-        result = win32api.SetConsoleCtrlHandler(self._console_event, 1)
-        if result == 0:
-            self.log('Could not SetConsoleCtrlHandler (error %r)' %
-                     win32api.GetLastError())
-        wspbus.Bus.__init__(self)
-    
-    def _console_event(self, event):
-        """The handler for console control events (like Ctrl-C)."""
-        if event in (win32con.CTRL_C_EVENT, win32con.CTRL_LOGOFF_EVENT,
-                     win32con.CTRL_BREAK_EVENT, win32con.CTRL_SHUTDOWN_EVENT,
-                     win32con.CTRL_CLOSE_EVENT):
-            self.log('Console event %s: shutting down bus' % event)
-            
-            # Remove this CtrlHandler so repeated Ctrl-C doesn't re-call it.
-            try:
-                result = win32api.SetConsoleCtrlHandler(self._console_event, 0)
-                if result == 0:
-                    self.log('Could not remove SetConsoleCtrlHandler (error %r)' %
-                             win32api.GetLastError())
-            except ValueError:
-                pass
-            
-            self.exit()
-            # 'First to return True stops the calls'
-            return 1
-        return 0
-    
-    def _get_state_event(self, state):