Clean-up signal handling since twisted.reactor handles it now

deluge/core/daemon.py

@@ -22,8 +22,6 @@
 # 	Boston, MA    02110-1301, USA.
 #
 
-import signal
-
 import gettext
 import locale
 import pkg_resources
@@ -51,12 +49,12 @@ class Daemon(object):
         except Exception, e:
             log.error("Unable to initialize gettext/locale: %s", e)
 
-        # Setup signals
-        signal.signal(signal.SIGINT, self.shutdown)
-        signal.signal(signal.SIGTERM, self.shutdown)
-        if not deluge.common.windows_check():
-            signal.signal(signal.SIGHUP, self.shutdown)
-        else:
+        # Twisted catches signals to terminate, so just have it call the shutdown
+        # method.
+        reactor.addSystemEventTrigger("after", "shutdown", self.shutdown)
+
+        # Catch some Windows specific signals
+        if deluge.common.windows_check():
             from win32api import SetConsoleCtrlHandler
             from win32con import CTRL_CLOSE_EVENT
             from win32con import CTRL_SHUTDOWN_EVENT

deluge/ui/gtkui/gtkui.py

@@ -33,7 +33,6 @@ import gobject
 import gettext
 import locale
 import pkg_resources
-import signal
 import gtk, gtk.glade
 
 import deluge.component as component
@@ -132,8 +131,10 @@ class GtkUI:
             self.gnome_client.connect("die", self.shutdown)
         except:
             pass
-        signal.signal(signal.SIGINT, self.shutdown)
-        signal.signal(signal.SIGTERM, self.shutdown)
+
+        # Twisted catches signals to terminate, so just have it call the shutdown
+        # method.
+        reactor.addSystemEventTrigger("after", "shutdown", self.shutdown)
 
         if deluge.common.windows_check():
             from win32api import SetConsoleCtrlHandler

deluge/ui/web/server.py

@@ -26,8 +26,6 @@ import os
 import time
 import locale
 import shutil
-import signal
-import signal
 import urllib
 import gettext
 import hashlib