mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Extra session exception handling

main
Bob Mottram 2020-06-23 14:41:12 +01:00
parent 72fdb90d17
commit 9fa258dc79
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
session.py
View File

@ -20,11 +20,16 @@ def createSession(proxyType: str):
session = None session = None
try: try:
session = requests.session() session = requests.session()
except ValueError as e:
print('WARN: error during createSession')
print(e)
return None
except SocketError as e: except SocketError as e:
if e.errno == errno.ECONNRESET: if e.errno == errno.ECONNRESET:
print('WARN: connection was reset during createSession') print('WARN: connection was reset during createSession')
else: else:
print('WARN: session request failed') print('WARN: socket error during createSession')
print(e)
return None return None
if not session: if not session:
return None return None
@ -65,13 +70,15 @@ def getJson(session, url: str, headers: {}, params: {},
try: try:
result = session.get(url, headers=sessionHeaders, params=sessionParams) result = session.get(url, headers=sessionHeaders, params=sessionParams)
return result.json() return result.json()
except SocketError as e: except ValueError as e:
if e.errno == errno.ECONNRESET:
print('WARN: connection was reset during getJson')
print('ERROR: getJson failed\nurl: ' + str(url) + '\n' + print('ERROR: getJson failed\nurl: ' + str(url) + '\n' +
'headers: ' + str(sessionHeaders) + '\n' + 'headers: ' + str(sessionHeaders) + '\n' +
'params: ' + str(sessionParams) + '\n') 'params: ' + str(sessionParams) + '\n')
print(e) print(e)
except SocketError as e:
if e.errno == errno.ECONNRESET:
print('WARN: connection was reset during getJson')
print(e)
return None return None
@ -92,11 +99,14 @@ def postJson(session, postJsonObject: {}, federationList: [],
session.post(url=inboxUrl, session.post(url=inboxUrl,
data=json.dumps(postJsonObject), data=json.dumps(postJsonObject),
headers=headers) headers=headers)
except ValueError as e:
print('ERROR: postJson failed ' + inboxUrl + ' ' +
json.dumps(postJsonObject) + ' ' + str(headers))
print(e)
return None
except SocketError as e: except SocketError as e:
if e.errno == errno.ECONNRESET: if e.errno == errno.ECONNRESET:
print('WARN: connection was reset during postJson') print('WARN: connection was reset during postJson')
print('ERROR: postJson failed ' + inboxUrl + ' ' +
json.dumps(postJsonObject) + ' ' + str(headers))
return None return None
if postResult: if postResult:
return postResult.text return postResult.text
@ -126,6 +136,10 @@ def postJsonString(session, postJsonStr: str,
try: try:
postResult = \ postResult = \
session.post(url=inboxUrl, data=postJsonStr, headers=headers) session.post(url=inboxUrl, data=postJsonStr, headers=headers)
except ValueError as e:
print('WARN: error during postJsonString')
print(e)
return None, None
except SocketError as e: except SocketError as e:
if e.errno == errno.ECONNRESET: if e.errno == errno.ECONNRESET:
print('WARN: connection was reset during postJsonString') print('WARN: connection was reset during postJsonString')
@ -181,11 +195,16 @@ def postImage(session, attachImageFilename: str, federationList: [],
try: try:
postResult = session.post(url=inboxUrl, data=mediaBinary, postResult = session.post(url=inboxUrl, data=mediaBinary,
headers=headers) headers=headers)
except ValueError as e:
print('WARN: error during postImage')
print(e)
return None
except SocketError as e: except SocketError as e:
if e.errno == errno.ECONNRESET: if e.errno == errno.ECONNRESET:
print('WARN: connection was reset during postImage') print('WARN: connection was reset during postImage')
print('ERROR: postImage failed ' + inboxUrl + ' ' + print('ERROR: postImage failed ' + inboxUrl + ' ' +
str(headers)) str(headers))
print(e)
return None return None
if postResult: if postResult:
return postResult.text return postResult.text