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/app | |
| 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/app')
| -rw-r--r-- | synapse/app/generic_worker.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py index 6e8130351c..c478df53be 100644 --- a/synapse/app/generic_worker.py +++ b/synapse/app/generic_worker.py @@ -940,7 +940,7 @@ def start(config_options): config.server.update_user_directory = False if config.worker_app == "synapse.app.federation_sender": - if config.federation.send_federation: + if config.worker.send_federation: sys.stderr.write( "\nThe send_federation must be disabled in the main synapse process" "\nbefore they can be run in a separate worker." @@ -950,10 +950,10 @@ def start(config_options): sys.exit(1) # Force the pushers to start since they will be disabled in the main config - config.federation.send_federation = True + config.worker.send_federation = True else: # For other worker types we force this to off. - config.federation.send_federation = False + config.worker.send_federation = False synapse.events.USE_FROZEN_DICTS = config.use_frozen_dicts |