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

Merge pull request #68 from soxoj/ssl-error-catching

Browse Source 
Fixed catching of python-specific exception
This commit is contained in:
soxoj
2021-03-13 00:00:45 +03:00
committed by GitHub
parent f7263c9b3c d5bc92d26a
commit 9e6bd05acc
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maigret/checking.py
+7 -3
View File
@@ -2,6 +2,7 @@ import asyncio
import logging
import re
import ssl
import sys
import aiohttp
import tqdm.asyncio
@@ -61,9 +62,6 @@ async def get_response(request_future, site_name, logger):
except asyncio.TimeoutError as errt:
error_text = "Timeout Error"
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:
error_text = "Error Connecting"
expection_text = str(err)
@@ -74,6 +72,12 @@ async def get_response(request_future, site_name, logger):
error_text = "Proxy Error"
expection_text = str(err)
except Exception as err:
# python-specific exceptions
if sys.version_info.minor > 6:
if isinstance(err, ssl.SSLCertVerificationError) or isinstance(err, ssl.SSLError):
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"