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/federation/federation_client.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/federation/federation_client.py')
| -rw-r--r-- | synapse/federation/federation_client.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index 2f2bf3a134..cbb9d354b6 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -194,6 +194,8 @@ class FederationClient(FederationBase): outlier (bool): Indicates whether the PDU is an `outlier`, i.e. if it's from an arbitary point in the context as opposed to part of the current block of PDUs. Defaults to `False` + timeout (int): How long to try (in ms) each destination for before + moving to the next destination. None indicates no timeout. Returns: Deferred: Results in the requested PDU. |