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

Merge branch 'fix-1245'

Browse source
This commit is contained in:
Jack Robison 2018-06-18 21:47:38 -04:00
commit 64a961c88c
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -19,6 +19,7 @@ at anytime.
* `publish` raising a database error when updating a claim that we don't have a file for (https://github.com/lbryio/lbry/issues/1165) * `publish` raising a database error when updating a claim that we don't have a file for (https://github.com/lbryio/lbry/issues/1165)
* approximations of bid when cast from float to Decimal during publish * approximations of bid when cast from float to Decimal during publish
* blob client protocol not tearing itself down properly after a failure (https://github.com/lbryio/lbry/issues/950) * blob client protocol not tearing itself down properly after a failure (https://github.com/lbryio/lbry/issues/950)
* lockup in wallet startup when one or more lbryumx servers are unavailable (https://github.com/lbryio/lbry/issues/1245)
### Deprecated ### Deprecated
* *

1
lbrynet/core/Wallet.py
View file

@ -132,6 +132,7 @@ class Wallet(object):
@defer.inlineCallbacks @defer.inlineCallbacks
def get_remote_height(self, server, port): def get_remote_height(self, server, port):
connected = defer.Deferred() connected = defer.Deferred()
connected.addTimeout(3, reactor, lambda *_: None)
client = StratumClient(connected) client = StratumClient(connected)
reactor.connectTCP(server, port, client) reactor.connectTCP(server, port, client)
yield connected yield connected