summary refs log tree commit diff
path: root/synapse/config/logger.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-07-31 10:30:05 +0100
committerRichard van der Hoff <richard@matrix.org>2020-07-31 10:30:05 +0100
commit82fec809a5c8be0a19bf2ca14f66d8d041dafeda (patch)
tree44adeb288d4659413e626f50e46d716401298d2a /synapse/config/logger.py
parentMerge branch 'release-v1.18.0' into matrix-org-hotfixes (diff)
parentAdd docs for undoing room shutdowns (#7998) (diff)
downloadsynapse-82fec809a5c8be0a19bf2ca14f66d8d041dafeda.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/logger.py')
-rw-r--r--synapse/config/logger.py2
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