codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-02-06 08:33:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wait for client to shutdown/disconnect before stopping reactor (fixes #2032)

Browse Source
This commit is contained in:
John Garland 2012-02-16 14:12:03 +11:00
parent 754a5a7f8a
commit 08a75bd9f9
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
deluge/ui/gtkui/mainwindow.py
View File

@ -44,7 +44,7 @@ from deluge.ui.client import client
import deluge.component as component import deluge.component as component
from deluge.configmanager import ConfigManager from deluge.configmanager import ConfigManager
from deluge.ui.gtkui.ipcinterface import process_args from deluge.ui.gtkui.ipcinterface import process_args
from twisted.internet import reactor from twisted.internet import reactor, defer
import deluge.common import deluge.common
import common import common
@ -157,12 +157,28 @@ class MainWindow(component.Component):
:param shutdown: whether or not to shutdown the daemon as well :param shutdown: whether or not to shutdown the daemon as well
:type shutdown: boolean :type shutdown: boolean
""" """
def shutdown_daemon(result):
return client.daemon.shutdown()
def disconnect_client(result):
return client.disconnect()
def stop_reactor(result):
return reactor.stop()
def log_failure(failure, action):
log.error("Encountered error attempting to %s: %s" % \
(action, failure.getErrorMessage()))
d = defer.succeed(None)
if shutdown: if shutdown:
try: d.addCallback(shutdown_daemon)
client.daemon.shutdown() d.addErrback(log_failure, "shutdown daemon")
except AttributeError, e: if not client.is_classicmode() and client.connected():
log.error("Encountered error attempting to shutdown daemon: %s", e) d.addCallback(disconnect_client)
reactor.stop() d.addErrback(log_failure, "disconnect client")
d.addBoth(stop_reactor)
def load_window_state(self): def load_window_state(self):
x = self.config["window_x_pos"] x = self.config["window_x_pos"]