summary refs log tree commit diff
path: root/synapse/config/logger.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-03-22 10:20:17 +0000
committerErik Johnston <erik@matrix.org>2019-03-22 10:20:17 +0000
commit3677548a82be347bcc69cfd4bfa4570581ee755f (patch)
tree0db80c2a0fb17c5fb9b3b5bd87f4691f5ac8adc7 /synapse/config/logger.py
parentMerge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_rooms (diff)
downloadsynapse-3677548a82be347bcc69cfd4bfa4570581ee755f.tar.xz
Use yaml safe_load
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 464c28c2d9..c1febbe9d3 100644 --- a/synapse/config/logger.py +++ b/synapse/config/logger.py
@@ -195,7 +195,7 @@ def setup_logging(config, use_worker_options=False): else: def load_log_config(): with open(log_config, 'r') as f: - logging.config.dictConfig(yaml.load(f)) + logging.config.dictConfig(yaml.safe_load(f)) def sighup(*args): # it might be better to use a file watcher or something for this.