Bitmessage/PyBitmessage-2024-12-20
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 52 Actions Packages Projects Releases 5 Wiki Activity

Convert 'API Error' to raise APIError() #446

Merged
Atheros1 merged 3 commits from master into master 2013-08-26 05:52:52 +02:00
Conversation 0 Commits 3 Files Changed 1 +2 -3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 14a968b499 - Show all commits

5
src/bitmessagemain.py
View File

@ -875,8 +875,8 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
except APIError as e: except APIError as e:
return str(e) return str(e)
except Exception as e: except Exception as e:
print(e) logger.critical(e)
print(sys.exc_info()[0]) logger.critical(sys.exc_info()[0])
return "API Error 0021: Unexpected API Failure - %s" % str(e) return "API Error 0021: Unexpected API Failure - %s" % str(e)
# This thread, of which there is only one, runs the API. # This thread, of which there is only one, runs the API.
@ -988,7 +988,6 @@ class Main:
def getApiAddress(self): def getApiAddress(self):
if not shared.safeConfigGetBoolean('bitmessagesettings', 'apienabled'): if not shared.safeConfigGetBoolean('bitmessagesettings', 'apienabled'):
return None return None
address = shared.config.get('bitmessagesettings', 'apiinterface') address = shared.config.get('bitmessagesettings', 'apiinterface')
port = shared.config.getint('bitmessagesettings', 'apiport') port = shared.config.getint('bitmessagesettings', 'apiport')
return {'address':address,'port':port} return {'address':address,'port':port}