Should fix #25

05bit · May 2, 2016 · 0c47ebe · 0c47ebe · rudyryk · May 2, 2016
1 parent 6a11dd4
commit 0c47ebe
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/peewee_async.py b/peewee_async.py
@@ -840,11 +840,16 @@ def connect_async(self, loop=None, timeout=None):
                 timeout=timeout,
                 **self.connect_kwargs_async)
 
-            yield from conn.connect()
-
-            self._task_data = TaskLocals(loop=self.loop)
-            self._async_conn = conn
-            self._async_wait.set_result(True)
+            try:
+                yield from conn.connect()
+            except:
+                self._async_wait.cancel()
+                self._async_wait = None
+                raise
+            else:
+                self._task_data = TaskLocals(loop=self.loop)
+                self._async_conn = conn
+                self._async_wait.set_result(True)
 
     @asyncio.coroutine
     def cursor_async(self):