summary refs log tree commit diff
diff options
context:
space:
mode:
authorJorik Schellekens <joriksch@gmail.com>2019-08-28 19:08:32 +0100
committerRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-08-28 19:08:32 +0100
commit92c1550f4abe1aa8495b0e1fc6dc38d338a4ecd1 (patch)
treed265777d939645bfaf84a3b874656fd6dba2400c
parentMerge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent (diff)
downloadsynapse-92c1550f4abe1aa8495b0e1fc6dc38d338a4ecd1.tar.xz
Add a link to python's logging config schema (#5926)
-rw-r--r--changelog.d/5926.misc1
-rw-r--r--docs/sample_config.yaml3
-rw-r--r--synapse/config/logger.py3
3 files changed, 5 insertions, 2 deletions
diff --git a/changelog.d/5926.misc b/changelog.d/5926.misc
new file mode 100644

index 0000000000..4383c302ec --- /dev/null +++ b/changelog.d/5926.misc
@@ -0,0 +1 @@ +Add link in sample config to the logging config schema. 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" """