ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-20 05:28:04 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Code refactor TorProvider from Daira's code review

Browse Source
This commit is contained in:
David Stainton 2016-09-20 15:24:05 +00:00 committed by Brian Warner
parent e02d21aed1
commit 897079105a
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/allmydata/torutil.py
View File

@ -32,21 +32,18 @@ class TorProvider:
Returns a deferred which fires with the txtorcon tor control port object
"""
if self.tor_control_protocol is not None:
d = defer.succeed(self.tor_control_protocol)
return defer.succeed(self.tor_control_protocol)
else:
if self.control_endpoint is None:
config = torconfig.TorConfig()
if self.data_directory is not None:
config['DataDirectory'] = self.data_directory
d = torconfig.launch_tor(config, reactor, tor_binary=self.tor_binary)
def remember_tor_protocol(result):
self.tor_control_protocol = result.tor_protocol
return result.tor_protocol
d.addCallback(remember_tor_protocol)
d.addCallback(lambda result: result.tor_protocol)
else:
d = torcontrolprotocol.connect(self.control_endpoint) # XXX use a password_function?
def remember_tor_protocol(result):
self.tor_control_protocol = result
return result
d.addCallback(remember_tor_protocol)
d = torcontrolprotocol.connect(self.control_endpoint)
def remember_tor_protocol(result):
self.tor_control_protocol = result
return result
d.addCallback(remember_tor_protocol)
return d