summary refs log tree commit diff
path: root/synapse/http
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-22 15:18:04 +0100
committerErik Johnston <erik@matrix.org>2015-05-22 15:18:04 +0100
commit284f55a7fbf597e32508301fe9571cd1b8523625 (patch)
tree71dbf784b0828a9709991be8e2b313de0b519d0c /synapse/http
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf (diff)
downloadsynapse-284f55a7fbf597e32508301fe9571cd1b8523625.tar.xz
Add doc strings
Diffstat (limited to '')
-rw-r--r--synapse/http/matrixfederationclient.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index 312bbcc6b8..6f976d5ce8 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -345,6 +345,9 @@ class MatrixFederationHttpClient(object):
             path (str): The HTTP path.
             args (dict): A dictionary used to create query strings, defaults to
                 None.
+            timeout (int): How long to try (in ms) the destination for before
+                giving up. None indicates no timeout and that the request will
+                be retried.
         Returns:
             Deferred: Succeeds when we get *any* HTTP response.