diff options
| author | Erik Johnston <erik@matrix.org> | 2021-02-24 13:23:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-24 13:23:18 +0000 |
| commit | 292792194232e68eb68c5135bb59d037d38b870b (patch) | |
| tree | 3951c198903b824b6db2cb05564ab3600eaad51f /synapse/app/admin_cmd.py | |
| parent | Refactor to ensure we call check_consistency (#9470) (diff) | |
| download | synapse-292792194232e68eb68c5135bb59d037d38b870b.tar.xz | |
Clean up `ShardedWorkerHandlingConfig` (#9466)
* Split ShardedWorkerHandlingConfig This is so that we have a type level understanding of when it is safe to call `get_instance(..)` (as opposed to `should_handle(..)`). * Remove special cases in ShardedWorkerHandlingConfig. `ShardedWorkerHandlingConfig` tried to handle the various different ways it was possible to configure federation senders and pushers. This led to special cases that weren't hit during testing. To fix this the handling of the different cases is moved from there and `generic_worker` into the worker config class. This allows us to have the logic in one place and allows the rest of the code to ignore the different cases.
Diffstat (limited to 'synapse/app/admin_cmd.py')
| -rw-r--r-- | synapse/app/admin_cmd.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/app/admin_cmd.py b/synapse/app/admin_cmd.py index b4bd4d8e7a..9f99651aa2 100644 --- a/synapse/app/admin_cmd.py +++ b/synapse/app/admin_cmd.py @@ -210,7 +210,9 @@ def start(config_options): config.update_user_directory = False config.run_background_tasks = False config.start_pushers = False + config.pusher_shard_config.instances = [] config.send_federation = False + config.federation_shard_config.instances = [] synapse.events.USE_FROZEN_DICTS = config.use_frozen_dicts |