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/storage/data_stores | |
| 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/storage/data_stores')
| -rw-r--r-- | synapse/storage/data_stores/main/stream.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/data_stores/main/stream.py b/synapse/storage/data_stores/main/stream.py index 5e32c7aa1e..10d39b3699 100644 --- a/synapse/storage/data_stores/main/stream.py +++ b/synapse/storage/data_stores/main/stream.py @@ -255,7 +255,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore): self._instance_name = hs.get_instance_name() self._send_federation = hs.should_send_federation() - self._federation_shard_config = hs.config.federation.federation_shard_config + self._federation_shard_config = hs.config.worker.federation_shard_config # If we're a process that sends federation we may need to reset the # `federation_stream_position` table to match the current sharding |