diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-22 16:10:42 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-22 16:10:42 +0100 |
| commit | 74b7de83ece889e585878c9974070e85a08d1a49 (patch) | |
| tree | 318942c37864d8e8683739ab83ac68f7b99c922c /synapse/http/matrixfederationclient.py | |
| parent | Actually return something from lambda (diff) | |
| parent | Merge pull request #156 from matrix-org/erikj/join_perf (diff) | |
| download | synapse-74b7de83ece889e585878c9974070e85a08d1a49.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/backfill_fixes
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 3 |
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. |