diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-19 14:53:32 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-19 14:53:32 +0100 |
| commit | 5b1631a4a9ad4c1ed0adaff3ffc8238014359e95 (patch) | |
| tree | 5aadd2fdcfc18e7565fb78c5e742c6b26b3796a3 /synapse/federation/federation_base.py | |
| parent | Handle the case when things return empty but non none things (diff) | |
| download | synapse-5b1631a4a9ad4c1ed0adaff3ffc8238014359e95.tar.xz | |
Add a timeout param to get_event
Diffstat (limited to 'synapse/federation/federation_base.py')
| -rw-r--r-- | synapse/federation/federation_base.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py index 5217d91aab..f0430b2cb1 100644 --- a/synapse/federation/federation_base.py +++ b/synapse/federation/federation_base.py @@ -80,6 +80,7 @@ class FederationBase(object): destinations=[pdu.origin], event_id=pdu.event_id, outlier=outlier, + timeout=10000, ) if new_pdu: |