mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-04 15:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Andrew Resch 2009-04-27 18:50:41 +00:00
commit 2ac545dec6
3 changed files with 37 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

14
deluge/core/daemon.py
View file

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

7
deluge/ui/gtkui/gtkui.py
View file

@ -33,7 +33,6 @@ import gobject
import gettext import gettext
import locale import locale
import pkg_resources import pkg_resources
import signal
import gtk, gtk.glade import gtk, gtk.glade
import deluge.component as component import deluge.component as component
@ -132,8 +131,10 @@ class GtkUI:
self.gnome_client.connect("die", self.shutdown) self.gnome_client.connect("die", self.shutdown)
except: except:
pass 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(): if deluge.common.windows_check():
from win32api import SetConsoleCtrlHandler from win32api import SetConsoleCtrlHandler

2
deluge/ui/web/server.py
View file

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