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/config/logger.py | |
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/config/logger.py')
-rw-r--r-- | synapse/config/logger.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/logger.py b/synapse/config/logger.py index 49f6c32beb..dd775a97e8 100644 --- a/synapse/config/logger.py +++ b/synapse/config/logger.py @@ -214,7 +214,7 @@ def setup_logging( Set up the logging subsystem. Args: - config (LoggingConfig | synapse.config.workers.WorkerConfig): + config (LoggingConfig | synapse.config.worker.WorkerConfig): configuration data use_worker_options (bool): True to use the 'worker_log_config' option |