summary refs log tree commit diff
path: root/synapse/config/logger.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-03-21 12:41:42 +0000
committerErik Johnston <erik@matrix.org>2019-03-21 12:41:42 +0000
commit0f0671e5e08b79364e88b8abbfaf77a304a277a4 (patch)
tree9188b8d2574889cdd6bd3a324dc8cbc44983fa16 /synapse/config/logger.py
parentMerge pull request #4875 from matrix-org/erikj/spam_checker (diff)
parentMerge pull request #4904 from matrix-org/erikj/fix_shutdown (diff)
downloadsynapse-0f0671e5e08b79364e88b8abbfaf77a304a277a4.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dinsic-merged
Diffstat (limited to 'synapse/config/logger.py')
-rw-r--r--synapse/config/logger.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/config/logger.py b/synapse/config/logger.py

index f6940b65fd..464c28c2d9 100644 --- a/synapse/config/logger.py +++ b/synapse/config/logger.py
@@ -81,7 +81,9 @@ class LoggingConfig(Config): def default_config(self, config_dir_path, server_name, **kwargs): log_config = os.path.join(config_dir_path, server_name + ".log.config") - return """ + return """\ + ## Logging ## + # A yaml python logging config file # log_config: "%(log_config)s"