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

logging

Browse source
This commit is contained in:
Jack Robison 2019-05-02 16:55:53 -04:00
parent 9099ee2e8e
commit cbe689ea7f
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lbrynet/stream/managed_stream.py
View file

@ -255,6 +255,7 @@ class ManagedStream:
timeout = timeout or self.config.download_timeout timeout = timeout or self.config.download_timeout
if self._running.is_set(): if self._running.is_set():
return return
log.info("start downloader for lbry://%s#%s (sd hash %s...)", self.claim_name, self.claim_id, self.sd_hash[:6])
self._running.set() self._running.set()
start_time = self.loop.time() start_time = self.loop.time()
try: try:
@ -301,6 +302,8 @@ class ManagedStream:
yield (blob_info, decrypted) yield (blob_info, decrypted)
async def stream_file(self, request: Request, node: typing.Optional['Node'] = None) -> StreamResponse: async def stream_file(self, request: Request, node: typing.Optional['Node'] = None) -> StreamResponse:
log.info("stream file to browser for lbry://%s#%s (sd hash %s...)", self.claim_name, self.claim_id,
self.sd_hash[:6])
await self.start(node) await self.start(node)
headers, size, skip_blobs = self._prepare_range_response_headers(request.headers.get('range', 'bytes=0-')) headers, size, skip_blobs = self._prepare_range_response_headers(request.headers.get('range', 'bytes=0-'))
response = StreamResponse( response = StreamResponse(
@ -319,7 +322,7 @@ class ManagedStream:
else: else:
await response.write(decrypted) await response.write(decrypted)
wrote += len(decrypted) wrote += len(decrypted)
log.info("streamed %sblob %i/%i", "(closing stream) " if response._eof_sent else "", log.info("sent browser %sblob %i/%i", "(final) " if response._eof_sent else "",
blob_info.blob_num + 1, len(self.descriptor.blobs) - 1) blob_info.blob_num + 1, len(self.descriptor.blobs) - 1)
if response._eof_sent: if response._eof_sent:
break break
@ -331,7 +334,8 @@ class ManagedStream:
self.streaming.clear() self.streaming.clear()
async def _save_file(self, output_path: str): async def _save_file(self, output_path: str):
log.debug("save file %s -> %s", self.sd_hash, output_path) log.info("save file for lbry://%s#%s (sd hash %s...) -> %s", self.claim_name, self.claim_id, self.sd_hash[:6],
output_path)
self.saving.set() self.saving.set()
self.finished_writing.clear() self.finished_writing.clear()
self.started_writing.clear() self.started_writing.clear()
@ -352,7 +356,7 @@ class ManagedStream:
self.finished_writing.set() self.finished_writing.set()
except Exception as err: except Exception as err:
if os.path.isfile(output_path): if os.path.isfile(output_path):
log.info("removing incomplete download %s for %s", output_path, self.sd_hash) log.warning("removing incomplete download %s for %s", output_path, self.sd_hash)
os.remove(output_path) os.remove(output_path)
if not isinstance(err, asyncio.CancelledError): if not isinstance(err, asyncio.CancelledError):
log.exception("unexpected error encountered writing file for stream %s", self.sd_hash) log.exception("unexpected error encountered writing file for stream %s", self.sd_hash)
@ -447,7 +451,8 @@ class ManagedStream:
else: else:
stalled_count += 1 stalled_count += 1
if stalled_count > 1: if stalled_count > 1:
log.info("Stopping inactive download for stream %s", self.sd_hash) log.info("stopping inactive download for lbry://%s#%s (%s...)", self.claim_name, self.claim_id,
self.sd_hash[:6])
await self.stop() await self.stop()
return return
await asyncio.sleep(1, loop=self.loop) await asyncio.sleep(1, loop=self.loop)