mirror/maigret
1
0
Fork 0
mirror of https://github.com/soxoj/maigret.git synced 2026-05-07 06:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed catching of python-specific exception

Browse Source
This commit is contained in:
Soxoj
2021-03-12 23:34:59 +03:00
parent f7263c9b3c
commit d5bc92d26a
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maigret/checking.py
+11 -7
View File
@@ -2,6 +2,7 @@ import asyncio
import logging import logging
import re import re
import ssl import ssl
import sys
import aiohttp import aiohttp
import tqdm.asyncio import tqdm.asyncio
@@ -61,9 +62,6 @@ async def get_response(request_future, site_name, logger):
except asyncio.TimeoutError as errt: except asyncio.TimeoutError as errt:
error_text = "Timeout Error" error_text = "Timeout Error"
expection_text = str(errt) expection_text = str(errt)
except (ssl.SSLCertVerificationError, ssl.SSLError) as err:
error_text = "SSL Error"
expection_text = str(err)
except aiohttp.client_exceptions.ClientConnectorError as err: except aiohttp.client_exceptions.ClientConnectorError as err:
error_text = "Error Connecting" error_text = "Error Connecting"
expection_text = str(err) expection_text = str(err)
@@ -74,10 +72,16 @@ async def get_response(request_future, site_name, logger):
error_text = "Proxy Error" error_text = "Proxy Error"
expection_text = str(err) expection_text = str(err)
except Exception as err: except Exception as err:
logger.warning(f'Unhandled error while requesting {site_name}: {err}') # python-specific exceptions
logger.debug(err, exc_info=True) if sys.version_info.minor > 6:
error_text = "Some Error" if isinstance(err, ssl.SSLCertVerificationError) or isinstance(err, ssl.SSLError):
expection_text = str(err) error_text = "SSL Error"
expection_text = str(err)
else:
logger.warning(f'Unhandled error while requesting {site_name}: {err}')
logger.debug(err, exc_info=True)
error_text = "Some Error"
expection_text = str(err)
# TODO: return only needed information # TODO: return only needed information
return html_text, status_code, error_text, expection_text return html_text, status_code, error_text, expection_text