Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

blob_reflect fix

Browse source
This commit is contained in:
Lex Berezhny 2019-01-10 18:40:20 -05:00
parent ebdb33bd11
commit b0deb63129
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lbrynet/extras/daemon/Daemon.py
View file

@ -3310,7 +3310,7 @@ class Daemon(metaclass=JSONRPCServerType):
return blob_hashes[start_index:stop_index] return blob_hashes[start_index:stop_index]
@requires(BLOB_COMPONENT) @requires(BLOB_COMPONENT)
def jsonrpc_blob_reflect(self, blob_hashes, reflector_server=None): async def jsonrpc_blob_reflect(self, blob_hashes, reflector_server=None):
""" """
Reflects specified blobs Reflects specified blobs
@ -3323,7 +3323,8 @@ class Daemon(metaclass=JSONRPCServerType):
Returns: Returns:
(list) reflected blob hashes (list) reflected blob hashes
""" """
return d2f(reupload.reflect_blob_hashes(blob_hashes, self.blob_manager, reflector_server)) result = await d2f(reupload.reflect_blob_hashes(blob_hashes, self.blob_manager, reflector_server))
return result
@requires(BLOB_COMPONENT) @requires(BLOB_COMPONENT)
async def jsonrpc_blob_reflect_all(self): async def jsonrpc_blob_reflect_all(self):

11
lbrynet/extras/reflector/client/blob.py
View file

@ -165,15 +165,10 @@ class BlobReflectorClient(Protocol):
blob_hash = self.blob_hashes_to_send[0] blob_hash = self.blob_hashes_to_send[0]
log.debug('No current blob, sending the next one: %s', blob_hash) log.debug('No current blob, sending the next one: %s', blob_hash)
self.blob_hashes_to_send = self.blob_hashes_to_send[1:] self.blob_hashes_to_send = self.blob_hashes_to_send[1:]
d = self.blob_manager.get_blob(blob_hash) blob = self.blob_manager.get_blob(blob_hash)
d.addCallback(self.open_blob_for_reading) self.open_blob_for_reading(blob)
# send the server the next blob hash + length # send the server the next blob hash + length
d.addCallbacks( return self.send_blob_info()
lambda _: self.send_blob_info(),
errback=log.fail(self.disconnect),
errbackArgs=("Error reflecting blob %s", blob_hash)
)
return d
else: else:
# close connection # close connection
log.debug('No more blob hashes, closing connection') log.debug('No more blob hashes, closing connection')

2
lbrynet/extras/reflector/reupload.py
View file

@ -45,7 +45,7 @@ def _reflect_blobs(blob_manager, blob_hashes, reflector_server):
ip = yield resolve(reflector_address) ip = yield resolve(reflector_address)
yield reactor.connectTCP(ip, reflector_port, factory) yield reactor.connectTCP(ip, reflector_port, factory)
result = yield factory.finished_deferred result = yield factory.finished_deferred
defer.returnValue(result) return result
def reflect_file(lbry_file, reflector_server=None): def reflect_file(lbry_file, reflector_server=None):