summary refs log tree commit diff
path: root/synapse/federation/transport/client.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2016-12-31 15:21:37 +0000
committerMark Haines <mark.haines@matrix.org>2017-01-05 11:58:15 +0000
commiteedf400d05ba72c2c21b55a64f67104af54e90bd (patch)
tree3c26480ce115e46e6f360bdfaf4e17cf572ef1e5 /synapse/federation/transport/client.py
parentMerge pull request #1764 from matrix-org/markjh/fix_send_pdu (diff)
downloadsynapse-eedf400d05ba72c2c21b55a64f67104af54e90bd.tar.xz
limit total timeout for get_missing_events to 10s
Diffstat (limited to 'synapse/federation/transport/client.py')
-rw-r--r--synapse/federation/transport/client.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py
index 491cdc29e1..915af34409 100644
--- a/synapse/federation/transport/client.py
+++ b/synapse/federation/transport/client.py
@@ -386,7 +386,7 @@ class TransportLayerClient(object):
     @defer.inlineCallbacks
     @log_function
     def get_missing_events(self, destination, room_id, earliest_events,
-                           latest_events, limit, min_depth):
+                           latest_events, limit, min_depth, timeout):
         path = PREFIX + "/get_missing_events/%s" % (room_id,)
 
         content = yield self.client.post_json(
@@ -397,7 +397,8 @@ class TransportLayerClient(object):
                 "min_depth": int(min_depth),
                 "earliest_events": earliest_events,
                 "latest_events": latest_events,
-            }
+            },
+            timeout=timeout,
         )
 
         defer.returnValue(content)