From c4314e6cdbcc5f9ea1c8064e33514dfb5106e4fd Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Tue, 22 Sep 2015 01:06:25 +0000 Subject: [PATCH] remove some debug logging --- rethinkstuff/__init__.py | 3 +-- tests/test_rethinker.py | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rethinkstuff/__init__.py b/rethinkstuff/__init__.py index bcc985c..c6b23ed 100644 --- a/rethinkstuff/__init__.py +++ b/rethinkstuff/__init__.py @@ -30,7 +30,7 @@ class RethinkerWrapper: for x in result: yield x finally: - self.logger.info("iterator finished, closing connection %s", conn) + result.close() conn.close() g = gen() # Start executing the generator, leaving off after the @@ -45,7 +45,6 @@ class RethinkerWrapper: pass finally: if not is_iter: - self.logger.info("closing connection %s", conn) conn.close(noreply_wait=False) class Rethinker(object): diff --git a/tests/test_rethinker.py b/tests/test_rethinker.py index f00b0d8..33f9749 100644 --- a/tests/test_rethinker.py +++ b/tests/test_rethinker.py @@ -13,7 +13,7 @@ class RethinkerForTesting(rethinkstuff.Rethinker): def _random_server_connection(self): self.last_conn = super(RethinkerForTesting, self)._random_server_connection() - logging.info("self.last_conn=%s", self.last_conn) + # logging.info("self.last_conn=%s", self.last_conn) return self.last_conn def test_rethinker(): @@ -61,5 +61,6 @@ def test_rethinker(): assert isinstance(result, types.GeneratorType) result = None gc.collect() + # connection should be closed after result is garbage-collected assert not r.last_conn.is_open()