summary refs log tree commit diff
path: root/synapse/config/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-07-29 23:22:13 +0100
committerGitHub <noreply@github.com>2020-07-29 23:22:13 +0100
commit2c1b9d676322fad8cb57c92f97f81393bcfcbe56 (patch)
tree98566808c5b6e83163ad151a261fcfb62033fd6b /synapse/config/federation.py
parent1.18.0rc2 (diff)
downloadsynapse-2c1b9d676322fad8cb57c92f97f81393bcfcbe56.tar.xz
Update worker docs with recent enhancements (#7969)
Diffstat (limited to 'synapse/config/federation.py')
-rw-r--r--synapse/config/federation.py12
1 files changed, 1 insertions, 11 deletions
diff --git a/synapse/config/federation.py b/synapse/config/federation.py

index 82ff9664de..2c77d8f85b 100644 --- a/synapse/config/federation.py +++ b/synapse/config/federation.py
@@ -17,23 +17,13 @@ from typing import Optional from netaddr import IPSet -from ._base import Config, ConfigError, ShardedWorkerHandlingConfig +from ._base import Config, ConfigError class FederationConfig(Config): section = "federation" def read_config(self, config, **kwargs): - # Whether to send federation traffic out in this process. This only - # applies to some federation traffic, and so shouldn't be used to - # "disable" federation - self.send_federation = config.get("send_federation", True) - - federation_sender_instances = config.get("federation_sender_instances") or [] - self.federation_shard_config = ShardedWorkerHandlingConfig( - federation_sender_instances - ) - # FIXME: federation_domain_whitelist needs sytests self.federation_domain_whitelist = None # type: Optional[dict] federation_domain_whitelist = config.get("federation_domain_whitelist", None)