Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow YAML config file to contain None (#7779)

Browse Source 
Useful when config file is fully commented

Signed-off-by: Alex Kotov <kotovalexarian@gmail.com>
This commit is contained in:
Alex Kotov 2020-07-03 17:19:03 +05:00 committed by GitHub
parent f3e0f16240
commit 8097659f6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/7779.bugfix Normal file
View File

@ -0,0 +1 @@
Fix synctl to handle empty config files correctly. Contributed by @kotovalexarian.

3
synctl
View File

@ -239,7 +239,8 @@ def main():
for config_file in config_files: for config_file in config_files:
with open(config_file) as file_stream: with open(config_file) as file_stream:
yaml_config = yaml.safe_load(file_stream) yaml_config = yaml.safe_load(file_stream)
config.update(yaml_config) if yaml_config is not None:
config.update(yaml_config)
pidfile = config["pid_file"] pidfile = config["pid_file"]
cache_factor = config.get("synctl_cache_factor") cache_factor = config.get("synctl_cache_factor")