diff options
| author | Erik Johnston <erikj@jki.re> | 2019-03-22 11:58:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-22 11:58:13 +0000 |
| commit | 5fee9d8067b0078d13ec99b08f1a2ff471478f38 (patch) | |
| tree | 1d2778edecc564dd5cfad09adb03cd236d6de4e3 /synapse/config/logger.py | |
| parent | Allow newsfragments to end with exclamation marks! (#4912) (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-5fee9d8067b0078d13ec99b08f1a2ff471478f38.tar.xz | |
Merge pull request #4869 from matrix-org/erikj/yaml_load
Fix yaml warnings by using safe_load
Diffstat (limited to 'synapse/config/logger.py')
| -rw-r--r-- | synapse/config/logger.py | 2 |
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. |