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

put results.close() in finally block

Browse Source
This commit is contained in:
Noah Levitt 2015-09-16 19:02:59 +00:00
parent b093c05a4a
commit 4ce4c4f0f6
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pyrethink/__init__.py
View File

@ -39,15 +39,23 @@ class Rethinker:
iterating over the results, for proper support of cursors, which fetch
from the server more than once."""
success = False
while not success:
with self._random_server_connection() as conn:
try:
results = query.run(conn, db=self.db)
success = True
for result in results:
yield result
if hasattr(results, 'close'):
results.close()
except (r.ReqlAvailabilityError, r.ReqlTimeoutError) as e:
self.logger.error('will retry rethinkdb query/operation %s which failed like so:', exc_info=True)
results = None
try:
while not success:
with self._random_server_connection() as conn:
try:
results = query.run(conn, db=self.db)
success = True
for result in results:
yield result
except (r.ReqlAvailabilityError, r.ReqlTimeoutError) as e:
if not success:
self.logger.error('will retry rethinkdb query/operation %s which failed like so:', exc_info=True)
else:
# initial query was successful, subsequent fetch
# perhaps failed, only caller can know what to do
raise
finally:
if results and hasattr(results, 'close'):
results.close()