Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-01-13 13:29:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Properly close providers.json file stream. (#12794)

Browse Source
This commit is contained in:
Petr Vaněk 2022-05-19 16:23:59 +02:00 committed by GitHub
parent 66a5f6c400
commit 684feeaf2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
Fix a bug introduced in 1.43.0 where a file (`providers.json`) was never closed. Contributed by @arkamar.

6
synapse/config/oembed.py
View File

@ -57,9 +57,9 @@ class OembedConfig(Config):
""" """
# Whether to use the packaged providers.json file. # Whether to use the packaged providers.json file.
if not oembed_config.get("disable_default_providers") or False: if not oembed_config.get("disable_default_providers") or False:
providers = json.load( with pkg_resources.resource_stream("synapse", "res/providers.json") as s:
pkg_resources.resource_stream("synapse", "res/providers.json") providers = json.load(s)
)
yield from self._parse_and_validate_provider( yield from self._parse_and_validate_provider(
providers, config_path=("oembed",) providers, config_path=("oembed",)
) )