put providers back in service tree

This commit is contained in:
meejah 2018-01-28 22:50:20 -07:00
parent e7a8d39fbc
commit 793827f8a6

View File

@ -433,14 +433,12 @@ def create_tub_options(config):
def create_i2p_provider(reactor, basedir, config): def create_i2p_provider(reactor, basedir, config):
provider = i2p_provider.Provider(basedir, config, reactor) provider = i2p_provider.Provider(basedir, config, reactor)
provider.check_dest_config() provider.check_dest_config()
#self._i2p_provider.setServiceParent(self)
return provider return provider
def create_tor_provider(reactor, basedir, config): def create_tor_provider(reactor, basedir, config):
provider = tor_provider.Provider(basedir, config, reactor) provider = tor_provider.Provider(basedir, config, reactor)
provider.check_onion_config() provider.check_onion_config()
##self._tor_provider.setServiceParent(self)
return provider return provider
@ -691,7 +689,9 @@ class Node(service.MultiService):
# this can go away once Client.init_client_storage_broker is moved into create_client() # this can go away once Client.init_client_storage_broker is moved into create_client()
self._i2p_provider = i2p_provider self._i2p_provider = i2p_provider
self._i2p_provider.setServiceParent(self)
self._tor_provider = tor_provider self._tor_provider = tor_provider
self._tor_provider.setServiceParent(self)
self.init_tempdir() self.init_tempdir()