Catching ALL types of early error. Fixes #79.

Its important to catch any type of early error and pass it back properly to give inner callback a chance to return connection back to free pool. Signed-off-by: Zaar Hai <[email protected]>
FSX · Nov 16, 2014 · b15c2c2 · b15c2c2
1 parent 6fb8d14
commit b15c2c2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/momoko/connection.py b/momoko/connection.py
@@ -606,7 +606,7 @@ def wrapper(self, *args, **kwargs):
             callback = kwargs.get("callback", _dummy_callback)
             try:
                 return func(self, *args, **kwargs)
-            except psycopg2.Error as error:
+            except Exception as error:
                 callback(None, error)
         return wrapper
 

diff --git a/tests.py b/tests.py
@@ -326,6 +326,16 @@ def func():
 
         self.assert_raises(psycopg2.ProgrammingError, self.run_gen, func)
 
+    def test_op_early_exception(self):
+        """Testing that Op propagates early exceptions properly"""
+        @gen.engine
+        def func():
+            cursor = yield momoko.Op(self.db.execute, 'SELECT %s FROM %s', ())
+            self.stop()
+
+        self.assert_raises(IndexError, self.run_gen, func)
+        self.assertFalse(self.db._conns.busy, msg="Busy connction was not returned to pool after exception")
+
     def test_wait_op(self):
         """Testing WaitOp"""
         @gen.engine