diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-04-27 15:01:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 15:01:03 +0200 |
| commit | cc9eceb00d9025d454663857cc03379427023ad8 (patch) | |
| tree | 252bba3ef5f98dd25304384a4990e8c4c02564d5 /changelog.d/7337.bugfix | |
| parent | Add documentation to the sample config about the templates for SSO. (#7343) (diff) | |
| download | synapse-cc9eceb00d9025d454663857cc03379427023ad8.tar.xz | |
Don't crash when one of the configuration files is empty (#7341)
If the admin adds a `.yaml` file that's either empty or doesn't parse into a dict to a config directory (e.g. `conf.d` for debs installs), stuff like https://github.com/matrix-org/synapse/issues/7322 would happen. This PR checks that the file is correctly parsed into a dict, or ignores it with a warning if it parses into any other type (including `None` for empty files). Fixes https://github.com/matrix-org/synapse/issues/7322
Diffstat (limited to 'changelog.d/7337.bugfix')
0 files changed, 0 insertions, 0 deletions