diff --git a/setup.py b/setup.py index 6d5fd50..b02f21d 100755 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ except: setuptools.setup( name='warcprox', - version='2.3.1b4.dev125', + version='2.3.1b4.dev126', description='WARC writing MITM HTTP/S proxy', url='https://github.com/internetarchive/warcprox', author='Noah Levitt', diff --git a/warcprox/trough.py b/warcprox/trough.py index 1edcc54..8c967fe 100644 --- a/warcprox/trough.py +++ b/warcprox/trough.py @@ -179,13 +179,13 @@ class TroughClient(object): with self._dirty_segments_lock: self._dirty_segments.add(segment_id) except: - del self._write_url_cache[segment_id] + self._write_url_cache.pop(segment_id, None) self.logger.error( 'problem with trough write url %r', write_url, exc_info=True) return if response.status_code != 200: - del self._write_url_cache[segment_id] + self._write_url_cache.pop(segment_id, None) self.logger.warn( 'unexpected response %r %r %r from %r to sql=%r', response.status_code, response.reason, response.text, @@ -201,12 +201,12 @@ class TroughClient(object): try: response = requests.post(read_url, sql) except: - del self._read_url_cache[segment_id] + self._read_url_cache.pop(segment_id, None) self.logger.error( 'problem with trough read url %r', read_url, exc_info=True) return None if response.status_code != 200: - del self._read_url_cache[segment_id] + self._read_url_cache.pop(segment_id, None) self.logger.warn( 'unexpected response %r %r %r from %r to sql=%r', response.status_code, response.reason, response.text,