codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-01-13 04:54:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly wait for the component.shutdown deferred on shutdown. This should prevent the daemon from exiting before all the state has been saved.

Browse Source
This commit is contained in:
Andrew Resch 2012-03-01 13:11:11 -08:00
parent ae6af18f0d
commit fd28bf8619
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
deluge/core/daemon.py
View File

@ -99,7 +99,7 @@ class Daemon(object):
# Twisted catches signals to terminate, so just have it call the shutdown
# method.
reactor.addSystemEventTrigger("after", "shutdown", self.shutdown)
reactor.addSystemEventTrigger("before", "shutdown", self._shutdown)
# Catch some Windows specific signals
if deluge.common.windows_check():
@ -171,17 +171,16 @@ class Daemon(object):
reactor.callLater(0, reactor.stop)
def _shutdown(self, *args, **kwargs):
try:
os.remove(deluge.configmanager.get_config_dir("deluged.pid"))
except Exception, e:
log.exception(e)
log.error("Error removing deluged.pid!")
if os.path.exists(deluge.configmanager.get_config_dir("deluged.pid")):
try:
os.remove(deluge.configmanager.get_config_dir("deluged.pid"))
except Exception, e:
log.exception(e)
log.error("Error removing deluged.pid!")
component.shutdown()
try:
reactor.stop()
except twisted.internet.error.ReactorNotRunning:
log.debug("Tried to stop the reactor but it is not running..")
log.info("Waiting for components to shutdown..")
d = component.shutdown()
return d
@export()
def get_method_list(self):