Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Don't crash when one of the configuration files is empty #7341

Merged
merged 2 commits into from
Apr 27, 2020
Merged

Don't crash when one of the configuration files is empty #7341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f748c5
Don't crash when one of the configuration files is empty
babolivier Apr 24, 2020
dfedbdb
Changelog
babolivier Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/7341.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix bad error handling that would cause Synapse to crash if it's provided with a YAML configuration file that's either empty or doesn't parse into a key-value map.
6 changes: 6 additions & 0 deletions synapse/config/_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,12 @@ def read_config_files(config_files):
for config_file in config_files:
with open(config_file) as file_stream:
yaml_config = yaml.safe_load(file_stream)

if not isinstance(yaml_config, dict):
err = "File %r is empty or doesn't parse into a key-value map. IGNORING."
print(err % (config_file,))
continue

specified_config.update(yaml_config)

if "server_name" not in specified_config:
Expand Down