mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-06-18 23:38:18 +00:00
Client: init_helper() must run after init_client()
This has worked so far because everything waited for the Tub to be ready. We'll soon be making Tub setup synchronous, so we won't have to wait anymore, so the order will matter.
This commit is contained in:
@ -140,15 +140,14 @@ class Client(node.Node, pollmixin.PollMixin):
|
||||
self.init_node_key()
|
||||
self.init_storage()
|
||||
self.init_control()
|
||||
self.helper = None
|
||||
if self.get_config("helper", "enabled", False, boolean=True):
|
||||
self.init_helper()
|
||||
self._key_generator = KeyGenerator()
|
||||
key_gen_furl = self.get_config("client", "key_generator.furl", None)
|
||||
if key_gen_furl:
|
||||
self.init_key_gen(key_gen_furl)
|
||||
self.init_client()
|
||||
# ControlServer and Helper are attached after Tub startup
|
||||
self.helper = None
|
||||
if self.get_config("helper", "enabled", False, boolean=True):
|
||||
self.init_helper()
|
||||
self.init_ftp_server()
|
||||
self.init_sftp_server()
|
||||
self.init_drop_uploader()
|
||||
|
Reference in New Issue
Block a user