diff --git a/lbrynet/daemon/DaemonCLI.py b/lbrynet/daemon/DaemonCLI.py index 6af740e42..e839588f6 100644 --- a/lbrynet/daemon/DaemonCLI.py +++ b/lbrynet/daemon/DaemonCLI.py @@ -110,7 +110,6 @@ def main(): else: print utils.json_dumps_pretty(result) except (RPCError, KeyError, JSONRPCException, HTTPError) as err: - error_data = None if isinstance(err, HTTPError): error_body = err.read() try: @@ -123,14 +122,19 @@ def main(): return 1 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: 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 diff --git a/lbrynet/reflector/client/client.py b/lbrynet/reflector/client/client.py index 3d8471058..85f72b785 100644 --- a/lbrynet/reflector/client/client.py +++ b/lbrynet/reflector/client/client.py @@ -237,7 +237,7 @@ class EncryptedFileReflectorClient(Protocol): self.file_sender = FileSender() return defer.succeed(True) 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() else: # Expecting Server Blob Response if 'received_blob' not in response_dict: