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

fixes #1029 - stupid error messages

Browse source
This commit is contained in:
Alex Grintsvayg 2017-12-13 13:56:44 -05:00
parent 668eaa6591
commit ebed4f010b
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lbrynet/daemon/DaemonCLI.py
View file

@ -110,7 +110,6 @@ def main():
else: else:
print utils.json_dumps_pretty(result) print utils.json_dumps_pretty(result)
except (RPCError, KeyError, JSONRPCException, HTTPError) as err: except (RPCError, KeyError, JSONRPCException, HTTPError) as err:
error_data = None
if isinstance(err, HTTPError): if isinstance(err, HTTPError):
error_body = err.read() error_body = err.read()
try: try:
@ -123,14 +122,19 @@ def main():
return 1 return 1
print_error(error_data['error']['message'] + "\n", suggest_help=False) print_error(error_data['error']['message'] + "\n", suggest_help=False)
if 'data' in error_data['error'] and 'traceback' in error_data['error']['data']:
print "Here's the traceback for the error you encountered:"
print "\n".join(error_data['error']['data']['traceback'])
print_help_for_command(method)
elif isinstance(err, RPCError):
print_error(err.msg, suggest_help=False)
# print_help_for_command(method)
else: else:
print_error("Something went wrong\n", suggest_help=False) print_error("Something went wrong\n", suggest_help=False)
print(str(err))
print_help_for_command(method)
if 'data' in error_data['error'] and 'traceback' in error_data['error']['data']:
print "Here's the traceback for the error you encountered:"
print "\n".join(error_data['error']['data']['traceback'])
return 1 return 1

2
lbrynet/reflector/client/client.py
View file

@ -237,7 +237,7 @@ class EncryptedFileReflectorClient(Protocol):
self.file_sender = FileSender() self.file_sender = FileSender()
return defer.succeed(True) return defer.succeed(True)
else: else:
log.warning("Reflector already has %s", self.next_blob_to_send) log.info("Reflector already has %s", self.next_blob_to_send)
return self.set_not_uploading() return self.set_not_uploading()
else: # Expecting Server Blob Response else: # Expecting Server Blob Response
if 'received_blob' not in response_dict: if 'received_blob' not in response_dict: