summary refs log tree commit diff
diff options
context:
space:
mode:
authorJorik Schellekens <joriks@matrix.org>2019-08-28 16:34:23 +0100
committerJorik Schellekens <joriks@matrix.org>2019-08-28 16:40:02 +0100
commit76e9a01edd2ad46e59c4825d833a681475edadb7 (patch)
tree89072279b85a454d898ca8731755c7afdd083496
parentMerge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent (diff)
downloadsynapse-76e9a01edd2ad46e59c4825d833a681475edadb7.tar.xz
Add link to logging file format
-rw-r--r--docs/sample_config.yaml3
-rw-r--r--synapse/config/logger.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml

index 6da1167632..43969bbb70 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml
@@ -485,7 +485,8 @@ database: ## Logging ## -# A yaml python logging config file +# A yaml python logging config file as described by +# https://docs.python.org/3.7/library/logging.config.html#configuration-dictionary-schema # log_config: "CONFDIR/SERVERNAME.log.config" diff --git a/synapse/config/logger.py b/synapse/config/logger.py
index 981df5a10c..2704c18720 100644 --- a/synapse/config/logger.py +++ b/synapse/config/logger.py
@@ -89,7 +89,8 @@ class LoggingConfig(Config): """\ ## Logging ## - # A yaml python logging config file + # A yaml python logging config file as described by + # https://docs.python.org/3.7/library/logging.config.html#configuration-dictionary-schema # log_config: "%(log_config)s" """