particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lib: more portable BadStatusLine checking

Browse source 
Fixes: https://pagure.io/koji/issue/2789
This commit is contained in:
Tomas Kopecek 2021-04-13 13:26:10 +02:00
parent 898d0e5de9
commit 290e1ddf31
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
koji/__init__.py
View file

@ -2274,17 +2274,13 @@ def is_conn_error(e):
# these values, this is a connection error.
if getattr(e, 'errno', None) in (errno.ECONNRESET, errno.ECONNABORTED, errno.EPIPE):
return True
if isinstance(e, six.moves.http_client.BadStatusLine):
if 'BadStatusLine' in str(e):
# we see errors like this in keep alive timeout races
# ConnectionError(ProtocolError('Connection aborted.', BadStatusLine("''",)),)
return True
try:
if isinstance(e, requests.exceptions.ConnectionError):
# we see errors like this in keep alive timeout races
# ConnectionError(ProtocolError('Connection aborted.', BadStatusLine("''",)),)
e2 = getattr(e, 'args', [None])[0]
if isinstance(e2, requests.packages.urllib3.exceptions.ProtocolError):
e3 = getattr(e2, 'args', [None, None])[1]
if isinstance(e3, six.moves.http_client.BadStatusLine):
return True
# same check as unwrapped socket error
if getattr(e2, 'errno', None) in (errno.ECONNRESET, errno.ECONNABORTED, errno.EPIPE):
return True