backup/warcprox
1
0
Fork 0
mirror of https://github.com/internetarchive/warcprox.git synced 2025-01-18 13:22:09 +01:00
Code Issues Projects Releases Activity

avoid unexpected error KeyError: ...

Browse Source
This commit is contained in:
Noah Levitt 2017-12-20 12:07:14 -08:00
parent 6b67f49da4
commit 0e324eaecf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -52,7 +52,7 @@ except:
setuptools.setup( setuptools.setup(
name='warcprox', name='warcprox',
version='2.3.1b4.dev125', version='2.3.1b4.dev126',
description='WARC writing MITM HTTP/S proxy', description='WARC writing MITM HTTP/S proxy',
url='https://github.com/internetarchive/warcprox', url='https://github.com/internetarchive/warcprox',
author='Noah Levitt', author='Noah Levitt',

8
warcprox/trough.py
View File

@ -179,13 +179,13 @@ class TroughClient(object):
with self._dirty_segments_lock: with self._dirty_segments_lock:
self._dirty_segments.add(segment_id) self._dirty_segments.add(segment_id)
except: except:
del self._write_url_cache[segment_id] self._write_url_cache.pop(segment_id, None)
self.logger.error( self.logger.error(
'problem with trough write url %r', write_url, 'problem with trough write url %r', write_url,
exc_info=True) exc_info=True)
return return
if response.status_code != 200: if response.status_code != 200:
del self._write_url_cache[segment_id] self._write_url_cache.pop(segment_id, None)
self.logger.warn( self.logger.warn(
'unexpected response %r %r %r from %r to sql=%r', 'unexpected response %r %r %r from %r to sql=%r',
response.status_code, response.reason, response.text, response.status_code, response.reason, response.text,
@ -201,12 +201,12 @@ class TroughClient(object):
try: try:
response = requests.post(read_url, sql) response = requests.post(read_url, sql)
except: except:
del self._read_url_cache[segment_id] self._read_url_cache.pop(segment_id, None)
self.logger.error( self.logger.error(
'problem with trough read url %r', read_url, exc_info=True) 'problem with trough read url %r', read_url, exc_info=True)
return None return None
if response.status_code != 200: if response.status_code != 200:
del self._read_url_cache[segment_id] self._read_url_cache.pop(segment_id, None)
self.logger.warn( self.logger.warn(
'unexpected response %r %r %r from %r to sql=%r', 'unexpected response %r %r %r from %r to sql=%r',
response.status_code, response.reason, response.text, response.status_code, response.reason, response.text,