CIRCL
/
AIL-framework
mirror of https://github.com/CIRCL/AIL-framework
2
1
Fork 0
Code Issues Releases Wiki Activity

fix: [Splash_Manager errors] catch invalid response

pull/569/head
Terrtia 2021-06-15 17:25:51 +02:00
parent 154558468f
commit 759ec73f84
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/lib/crawlers.py
View File

@ -892,12 +892,17 @@ def ping_splash_manager():
update_splash_manager_connection_status(True) update_splash_manager_connection_status(True)
return True return True
else: else:
try:
res = req.json() res = req.json()
if 'reason' in res: if 'reason' in res:
req_error = {'status_code': req.status_code, 'error': res['reason']} req_error = {'status_code': req.status_code, 'error': res['reason']}
else: else:
print(req.json()) print(req.json())
req_error = {'status_code': req.status_code, 'error': json.dumps(req.json())} req_error = {'status_code': req.status_code, 'error': json.dumps(req.json())}
except json.decoder.JSONDecodeError:
print(req.status_code)
print(req.headers)
req_error = {'status_code': req.status_code, 'error': 'Invalid response'}
update_splash_manager_connection_status(False, req_error=req_error) update_splash_manager_connection_status(False, req_error=req_error)
return False return False
except requests.exceptions.ConnectionError: except requests.exceptions.ConnectionError: