summary refs log tree commit diff
path: root/synctl
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-03-22 11:58:13 +0000
committerGitHub <noreply@github.com>2019-03-22 11:58:13 +0000
commit5fee9d8067b0078d13ec99b08f1a2ff471478f38 (patch)
tree1d2778edecc564dd5cfad09adb03cd236d6de4e3 /synctl
parentAllow newsfragments to end with exclamation marks! (#4912) (diff)
parentNewsfile (diff)
downloadsynapse-5fee9d8067b0078d13ec99b08f1a2ff471478f38.tar.xz
Merge pull request #4869 from matrix-org/erikj/yaml_load
Fix yaml warnings by using safe_load
Diffstat (limited to 'synctl')
-rwxr-xr-xsynctl4
1 files changed, 2 insertions, 2 deletions
diff --git a/synctl b/synctl
index 816c898b36..07a68e6d85 100755
--- a/synctl
+++ b/synctl
@@ -164,7 +164,7 @@ def main():
         sys.exit(1)
 
     with open(configfile) as stream:
-        config = yaml.load(stream)
+        config = yaml.safe_load(stream)
 
     pidfile = config["pid_file"]
     cache_factor = config.get("synctl_cache_factor")
@@ -206,7 +206,7 @@ def main():
     workers = []
     for worker_configfile in worker_configfiles:
         with open(worker_configfile) as stream:
-            worker_config = yaml.load(stream)
+            worker_config = yaml.safe_load(stream)
         worker_app = worker_config["worker_app"]
         if worker_app == "synapse.app.homeserver":
             # We need to special case all of this to pick up options that may