diff options
| author | Mathieu Velten <mathieuv@matrix.org> | 2023-06-14 14:54:19 +0200 |
|---|---|---|
| committer | Mathieu Velten <mathieuv@matrix.org> | 2023-06-14 14:54:19 +0200 |
| commit | 87e5df9a6ed772daf1070919845942b39143252e (patch) | |
| tree | 279a35124ac01a940e0c9ec6965685028d58f8b8 /synapse/config/federation.py | |
| parent | Prefill events after invalidate not before when persisting events (#15758) (diff) | |
| parent | 1.86.0rc2 (diff) | |
| download | synapse-87e5df9a6ed772daf1070919845942b39143252e.tar.xz | |
Merge branch 'release-v1.86' into develop
Diffstat (limited to 'synapse/config/federation.py')
| -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"}} |