diff options
author | Erik Johnston <erik@matrix.org> | 2017-03-29 10:57:19 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-03-29 10:57:19 +0100 |
commit | 4ad613f6be7211edf4b39d7b031bc7d2947d8297 (patch) | |
tree | d3e1835e7d3f5694098d06b093edcf2cd7d0e60f /synapse/federation/transport/client.py | |
parent | Correctly look up key (diff) | |
parent | Merge pull request #2037 from ricco386/fix_readme_centos_issues (diff) | |
download | synapse-4ad613f6be7211edf4b39d7b031bc7d2947d8297.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/e2e_one_time_upsert
Diffstat (limited to 'synapse/federation/transport/client.py')
-rw-r--r-- | synapse/federation/transport/client.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py index f49e8a2cc4..15a03378f5 100644 --- a/synapse/federation/transport/client.py +++ b/synapse/federation/transport/client.py @@ -163,6 +163,7 @@ class TransportLayerClient(object): data=json_data, json_data_callback=json_data_callback, long_retries=True, + backoff_on_404=True, # If we get a 404 the other side has gone ) logger.debug( @@ -174,7 +175,8 @@ class TransportLayerClient(object): @defer.inlineCallbacks @log_function - def make_query(self, destination, query_type, args, retry_on_dns_fail): + def make_query(self, destination, query_type, args, retry_on_dns_fail, + ignore_backoff=False): path = PREFIX + "/query/%s" % query_type content = yield self.client.get_json( @@ -183,6 +185,7 @@ class TransportLayerClient(object): args=args, retry_on_dns_fail=retry_on_dns_fail, timeout=10000, + ignore_backoff=ignore_backoff, ) defer.returnValue(content) @@ -242,6 +245,7 @@ class TransportLayerClient(object): destination=destination, path=path, data=content, + ignore_backoff=True, ) defer.returnValue(response) @@ -269,6 +273,7 @@ class TransportLayerClient(object): destination=remote_server, path=path, args=args, + ignore_backoff=True, ) defer.returnValue(response) |