summary refs log tree commit diff
path: root/synapse/http
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-11-28 20:09:39 +0000
committerBrendan Abolivier <babolivier@matrix.org>2019-02-13 20:54:34 +0000
commitf8b891c5e75a5f4c29be126aa94fcafee07cb6df (patch)
tree122260752feb93634b1f3029e14b788e3b63b3b5 /synapse/http
parentMake event_ids smaller (diff)
downloadsynapse-f8b891c5e75a5f4c29be126aa94fcafee07cb6df.tar.xz
Reduce size of fed transaction IDs
Diffstat (limited to 'synapse/http')
-rw-r--r--synapse/http/endpoint.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/http/endpoint.py b/synapse/http/endpoint.py
index 91025037a3..df528113a4 100644
--- a/synapse/http/endpoint.py
+++ b/synapse/http/endpoint.py
@@ -194,8 +194,11 @@ class _WrappedConnection(object):
             # In Twisted >18.4; the TLS connection will be None if it has closed
             # which will make abortConnection() throw. Check that the TLS connection
             # is not None before trying to close it.
-            if self.transport.getHandle() is not None:
-                self.transport.abortConnection()
+            try:
+                if self.transport.getHandle() is not None:
+                    self.transport.abortConnection()
+            except:
+                logger.warning("Failed to abort connection")
 
     def request(self, request):
         self.last_request = time.time()