diff options
author | bendikro <bro.devel+deluge@gmail.com> | 2015-12-15 18:26:53 +0100 |
---|---|---|
committer | bendikro <bro.devel+deluge@gmail.com> | 2016-04-10 00:10:48 +0200 |
commit | bcc1db12e5763e9cc6b2ad5379b16381221f52cb (patch) | |
tree | 9aa0fcb128503ea1aacf4d1f61d0623dafda2aad /deluge/ui/client.py | |
parent | 533951afeac670401e975297cd8f73f41ba4c5bf (diff) | |
download | deluge-bcc1db12e5763e9cc6b2ad5379b16381221f52cb.tar.gz deluge-bcc1db12e5763e9cc6b2ad5379b16381221f52cb.tar.bz2 deluge-bcc1db12e5763e9cc6b2ad5379b16381221f52cb.zip |
[Tests] Improved common.start_core
* Replace Popen with reactor.spawnProcess and read process
output with twisted.internet.protocol.ProcessProtocol
* Implement support for running custom script code
* Now logs to stdout instead of stderr when not logging to file
Diffstat (limited to 'deluge/ui/client.py')
-rw-r--r-- | deluge/ui/client.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/deluge/ui/client.py b/deluge/ui/client.py index 762827272..e2c6e24ec 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -208,8 +208,10 @@ class DelugeRPCClientFactory(ClientFactory): self.daemon.port = None self.daemon.username = None self.daemon.connected = False - if self.daemon.disconnect_deferred: + + if self.daemon.disconnect_deferred and not self.daemon.disconnect_deferred.called: self.daemon.disconnect_deferred.callback(reason.value) + self.daemon.disconnect_deferred = None if self.daemon.disconnect_callback: self.daemon.disconnect_callback() @@ -428,6 +430,7 @@ class DaemonClassicProxy(DaemonProxy): event_handlers = {} from deluge.core import daemon self.__daemon = daemon.Daemon(classic=True) + self.__daemon.start() log.debug("daemon created!") self.connected = True self.host = "localhost" |