LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

Merge branch 'startup-fixes'

Browse source
This commit is contained in:
Jack Robison 2017-10-23 01:29:36 -04:00
commit c9a5512ed4
No known key found for this signature in database
GPG key ID: 284699E7404E3CFF
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -13,8 +13,9 @@ at anytime.
* *
### Fixed ### Fixed
* * Fixed slow startup for nodes with many lbry files
* * Fixed setting the external ip on startup
* Fixed session startup not blocking on joining the dht
### Deprecated ### Deprecated
* *

4
lbrynet/core/Session.py
View file

@ -260,8 +260,7 @@ class Session(object):
addresses.append(value) addresses.append(value)
return addresses return addresses
def start_dht(addresses): def start_dht(join_network_result):
self.dht_node.joinNetwork(addresses)
self.peer_finder.run_manage_loop() self.peer_finder.run_manage_loop()
self.hash_announcer.run_manage_loop() self.hash_announcer.run_manage_loop()
return True return True
@ -283,6 +282,7 @@ class Session(object):
dl = defer.DeferredList(ds) dl = defer.DeferredList(ds)
dl.addCallback(join_resolved_addresses) dl.addCallback(join_resolved_addresses)
dl.addCallback(self.dht_node.joinNetwork)
dl.addCallback(start_dht) dl.addCallback(start_dht)
return dl return dl

3
lbrynet/daemon/Daemon.py
View file

@ -569,7 +569,8 @@ class Daemon(AuthJSONRPCServer):
peer_port=self.peer_port, peer_port=self.peer_port,
use_upnp=self.use_upnp, use_upnp=self.use_upnp,
wallet=wallet, wallet=wallet,
is_generous=conf.settings['is_generous_host'] is_generous=conf.settings['is_generous_host'],
external_ip=self.platform['ip']
) )
self.startup_status = STARTUP_STAGES[2] self.startup_status = STARTUP_STAGES[2]

9
lbrynet/file_manager/EncryptedFileManager.py
View file

@ -53,9 +53,9 @@ class EncryptedFileManager(object):
def setup(self): def setup(self):
yield self._open_db() yield self._open_db()
yield self._add_to_sd_identifier() yield self._add_to_sd_identifier()
yield self._start_lbry_files() # don't block on starting the lbry files
if self.auto_re_reflect is True: self._start_lbry_files()
safe_start_looping_call(self.lbry_file_reflector, self.auto_re_reflect_interval) log.info("Started file manager")
def get_lbry_file_status(self, lbry_file): def get_lbry_file_status(self, lbry_file):
return self._get_lbry_file_status(lbry_file.rowid) return self._get_lbry_file_status(lbry_file.rowid)
@ -119,6 +119,9 @@ class EncryptedFileManager(object):
self._set_options_and_restore(rowid, stream_hash, options) self._set_options_and_restore(rowid, stream_hash, options)
for rowid, stream_hash, options in files_and_options for rowid, stream_hash, options in files_and_options
]) ])
if self.auto_re_reflect is True:
safe_start_looping_call(self.lbry_file_reflector, self.auto_re_reflect_interval)
log.info("Started %i lbry files", len(self.lbry_files)) log.info("Started %i lbry files", len(self.lbry_files))
@defer.inlineCallbacks @defer.inlineCallbacks