Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-17 17:44:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add resources.consent conditional dependency back (#8107)

Browse Source 
Turns out that part of the codebase (synapse.config.server) checks for this key explicitly. Remove that check.
This commit is contained in:
Andrew Morgan 2020-08-18 10:59:54 +01:00 committed by GitHub
parent 050e20e7ca
commit 8b6c176aee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/8107.feature Normal file
View File

@ -0,0 +1 @@
Use the default template file when its equivalent is not found in a custom template directory.

20
synapse/config/server.py
View File

@ -26,7 +26,6 @@ import yaml
from synapse.api.room_versions import KNOWN_ROOM_VERSIONS from synapse.api.room_versions import KNOWN_ROOM_VERSIONS
from synapse.http.endpoint import parse_and_validate_server_name from synapse.http.endpoint import parse_and_validate_server_name
from synapse.python_dependencies import DependencyException, check_requirements
from ._base import Config, ConfigError from ._base import Config, ConfigError
@ -508,8 +507,6 @@ class ServerConfig(Config):
) )
) )
_check_resource_config(self.listeners)
self.cleanup_extremities_with_dummy_events = config.get( self.cleanup_extremities_with_dummy_events = config.get(
"cleanup_extremities_with_dummy_events", True "cleanup_extremities_with_dummy_events", True
) )
@ -1133,20 +1130,3 @@ def _warn_if_webclient_configured(listeners: Iterable[ListenerConfig]) -> None:
if name == "webclient": if name == "webclient":
logger.warning(NO_MORE_WEB_CLIENT_WARNING) logger.warning(NO_MORE_WEB_CLIENT_WARNING)
return return
def _check_resource_config(listeners: Iterable[ListenerConfig]) -> None:
resource_names = {
res_name
for listener in listeners
if listener.http_options
for res in listener.http_options.resources
for res_name in res.names
}
for resource in resource_names:
if resource == "consent":
try:
check_requirements("resources.consent")
except DependencyException as e:
raise ConfigError(e.message)