diff options
| author | Olivier Wilkinson (reivilibre) <olivier@librepush.net> | 2020-07-30 15:18:36 +0100 |
|---|---|---|
| committer | Olivier Wilkinson (reivilibre) <olivier@librepush.net> | 2020-07-30 15:18:36 +0100 |
| commit | 3aa36b782c715a2d3c965d5d9b37f7a49a5f17e1 (patch) | |
| tree | 16ab78763c83a0b7b5157f0fe0dca6b4135fd47c /synapse/federation/sender | |
| parent | Convert federation client to async/await. (#7975) (diff) | |
| parent | Fix formatting of changelog and upgrade notes (diff) | |
| download | synapse-3aa36b782c715a2d3c965d5d9b37f7a49a5f17e1.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/federation/sender')
| -rw-r--r-- | synapse/federation/sender/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/federation/sender/per_destination_queue.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/sender/__init__.py b/synapse/federation/sender/__init__.py index 8f549ae6ee..94cc63001e 100644 --- a/synapse/federation/sender/__init__.py +++ b/synapse/federation/sender/__init__.py @@ -70,7 +70,7 @@ class FederationSender(object): self._transaction_manager = TransactionManager(hs) self._instance_name = hs.get_instance_name() - self._federation_shard_config = hs.config.federation.federation_shard_config + self._federation_shard_config = hs.config.worker.federation_shard_config # map from destination to PerDestinationQueue self._per_destination_queues = {} # type: Dict[str, PerDestinationQueue] diff --git a/synapse/federation/sender/per_destination_queue.py b/synapse/federation/sender/per_destination_queue.py index 3436741783..dd150f89a6 100644 --- a/synapse/federation/sender/per_destination_queue.py +++ b/synapse/federation/sender/per_destination_queue.py @@ -75,7 +75,7 @@ class PerDestinationQueue(object): self._store = hs.get_datastore() self._transaction_manager = transaction_manager self._instance_name = hs.get_instance_name() - self._federation_shard_config = hs.config.federation.federation_shard_config + self._federation_shard_config = hs.config.worker.federation_shard_config self._should_send_on_this_instance = True if not self._federation_shard_config.should_handle( |