Merge pull request #229 from IlyaSkriblovsky/distinct-autoreconnect-i…

…nstances Do not reuse exception instances
twisted · Mar 16, 2018 · c1e08b7 · c1e08b7
2 parents af42461 + c45caae
commit c1e08b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/docs/source/NEWS.rst b/docs/source/NEWS.rst
@@ -11,6 +11,7 @@ Bugfixes
 ^^^^^^^^
 
 - Fixed compatibility of `Collection.aggregate()` with PyMongo 3.6
+- AutoReconnect exceptions may give invalid stack traces when not handled
 
 Features
 ^^^^^^^^

diff --git a/txmongo/protocol.py b/txmongo/protocol.py
@@ -323,16 +323,14 @@ def connectionLost(self, reason=connectionDone):
         # too late.
         self.factory.setInstance(None, reason)
 
-        auto_reconnect = AutoReconnect("TxMongo lost connection to MongoDB.")
-
         if self.__deferreds:
             deferreds, self.__deferreds = self.__deferreds, {}
             for df in deferreds.values():
-                df.errback(auto_reconnect)
+                df.errback(AutoReconnect("TxMongo lost connection to MongoDB."))
         deferreds, self.__connection_ready = self.__connection_ready, []
         if deferreds:
             for df in deferreds:
-                df.errback(auto_reconnect)
+                df.errback(AutoReconnect("TxMongo lost connection to MongoDB."))
 
         protocol.Protocol.connectionLost(self, reason)