oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rev483, Log uPnP error parse errors

Browse source
This commit is contained in:
HelloZeroNet 2016-01-12 23:57:52 +01:00
parent 6427709dec
commit 8edbcb7a6c
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Config.py
View file

@ -8,7 +8,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.3.5" self.version = "0.3.5"
self.rev = 841 self.rev = 843
self.argv = argv self.argv = argv
self.action = None self.action = None
self.createParser() self.createParser()

16
src/util/UpnpPunch.py
View file

@ -139,11 +139,17 @@ def _create_soap_message(local_ip, port, description="UPnPPunch", protocol="TCP"
def _parse_for_errors(soap_response): def _parse_for_errors(soap_response):
if soap_response.status == 500: if soap_response.status == 500:
err_dom = parseString(soap_response.read()) response_data = soap_response.read()
err_code = _node_val(err_dom.getElementsByTagName('errorCode')[0]) try:
err_msg = _node_val( err_dom = parseString(response_data)
err_dom.getElementsByTagName('errorDescription')[0] err_code = _node_val(err_dom.getElementsByTagName('errorCode')[0])
) err_msg = _node_val(
err_dom.getElementsByTagName('errorDescription')[0]
)
except Exception, err:
logging.error("Unable to parse SOAP error: {0}, response: {1}".format(err, response_data))
return False
logging.error('SOAP request error: {0} - {1}'.format(err_code, err_msg)) logging.error('SOAP request error: {0} - {1}'.format(err_code, err_msg))
raise Exception( raise Exception(
'SOAP request error: {0} - {1}'.format(err_code, err_msg) 'SOAP request error: {0} - {1}'.format(err_code, err_msg)