summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-24 17:19:20 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-24 17:19:20 +0000
commit88c5b43d130b296fc6bb772c96a4479f097425be (patch)
tree9635b73d41a59bb95aa818ff9d8d02f4621fa956
parentMerge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent (diff)
parentAdd a link to python's logging config schema (#5926) (diff)
downloadsynapse-88c5b43d130b296fc6bb772c96a4479f097425be.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 a580d721d2..f88475d1d8 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -560,7 +560,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"
         """