diff options
| author | Mathieu Velten <mathieuv@matrix.org> | 2023-06-14 11:55:09 +0200 |
|---|---|---|
| committer | Mathieu Velten <mathieuv@matrix.org> | 2023-06-14 11:55:57 +0200 |
| commit | ef0d3d7bd941b497ad8291c58bcc53700e08b999 (patch) | |
| tree | ddfde7c540f0b50566fbb770d694c6ec334e5990 /synapse/config | |
| parent | Fix empty scope when having version mismatch between workers (#15774) (diff) | |
| download | synapse-ef0d3d7bd941b497ad8291c58bcc53700e08b999.tar.xz | |
Revert "Allow for the configuration of max request retries and min/max retry delays in the matrix federation client (#12504)"
This reverts commit d84e66144dc12dacf71c987a2ba802dd59c0b68e.
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/federation.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/synapse/config/federation.py b/synapse/config/federation.py index d21f7fd02a..336fca578a 100644 --- a/synapse/config/federation.py +++ b/synapse/config/federation.py @@ -22,8 +22,6 @@ class FederationConfig(Config): section = "federation" def read_config(self, config: JsonDict, **kwargs: Any) -> None: - federation_config = config.setdefault("federation", {}) - # FIXME: federation_domain_whitelist needs sytests self.federation_domain_whitelist: Optional[dict] = None federation_domain_whitelist = config.get("federation_domain_whitelist", None) @@ -51,13 +49,5 @@ class FederationConfig(Config): "allow_device_name_lookup_over_federation", False ) - # Allow for the configuration of timeout, max request retries - # and min/max retry delays in the matrix federation client. - self.client_timeout = federation_config.get("client_timeout", 60) - self.max_long_retry_delay = federation_config.get("max_long_retry_delay", 60) - self.max_short_retry_delay = federation_config.get("max_short_retry_delay", 2) - self.max_long_retries = federation_config.get("max_long_retries", 10) - self.max_short_retries = federation_config.get("max_short_retries", 3) - _METRICS_FOR_DOMAINS_SCHEMA = {"type": "array", "items": {"type": "string"}} |