Changeset 725198

Timestamp:

04/27/2009 06:46:30 PM (16 years ago)

Author:

Damien Churchill <damoc@gmail.com>

Branches:

2.0.x, develop, extjs4-port, master

Children:

2ac545d

Parents:

9f2b98

Message:

fix handling close on windows

File:

• deluge/ui/web/server.py (modified) (3 diffs)

deluge/ui/web/server.py

@@ -27 +27 @@
 import locale
 import shutil
+import signal
 import signal
 import urllib
@@ -349 +350 @@
         # use of it.
         reactor.addSystemEventTrigger("after", "shutdown", self.shutdown)
+
+        # Twisted doesn't handle windows specific signals so we still
+        # need to attach to those to handle the close correctly.
+        if common.windows_check():
+            from win32api import SetConsoleCtrlHandler
+            from win32con import CTRL_CLOSE_EVENT, CTRL_SHUTDOWN_EVENT
+            def win_handler(ctrl_type):
+                log.debug("ctrl type: %s", ctrl_type)
+                if ctrl_type == CTRL_CLOSE_EVENT or \
+                   ctrl_type == CTRL_SHUTDOWN_EVENT:
+                    self.shutdown()
+                    return 1
+            SetConsoleCtrlHandler(win_handler)
         
         # Initalize the plugins
@@ -360 +374 @@
         reactor.run()
 
-    def shutdown(self):
+    def shutdown(self, *args):
         log.info("Shutting down webserver")
         log.debug("Saving configuration file")
         self.config.save()
+        try:
+            reactor.stop()
+        except error.ReactorNotRunning:
+            log.debug("Reactor not running")
 
 if __name__ == "__builtin__":