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

Commit 2201bc9

Browse files
authored
Don't refuse to start worker if media listener configured. (#7002)
Instead lets just warn if the worker has a media listener configured but has the media repository disabled. Previously non media repository workers would just ignore the media listener.
1 parent cab4a52 commit 2201bc9

File tree

2 files changed

+21
-14
lines changed

2 files changed

+21
-14
lines changed

changelog.d/7002.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Merge worker apps together.

synapse/app/generic_worker.py

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -494,20 +494,26 @@ def _listen_http(self, listener_config):
494494
elif name == "federation":
495495
resources.update({FEDERATION_PREFIX: TransportLayerServer(self)})
496496
elif name == "media":
497-
media_repo = self.get_media_repository_resource()
498-
499-
# We need to serve the admin servlets for media on the
500-
# worker.
501-
admin_resource = JsonResource(self, canonical_json=False)
502-
register_servlets_for_media_repo(self, admin_resource)
503-
504-
resources.update(
505-
{
506-
MEDIA_PREFIX: media_repo,
507-
LEGACY_MEDIA_PREFIX: media_repo,
508-
"/_synapse/admin": admin_resource,
509-
}
510-
)
497+
if self.config.can_load_media_repo:
498+
media_repo = self.get_media_repository_resource()
499+
500+
# We need to serve the admin servlets for media on the
501+
# worker.
502+
admin_resource = JsonResource(self, canonical_json=False)
503+
register_servlets_for_media_repo(self, admin_resource)
504+
505+
resources.update(
506+
{
507+
MEDIA_PREFIX: media_repo,
508+
LEGACY_MEDIA_PREFIX: media_repo,
509+
"/_synapse/admin": admin_resource,
510+
}
511+
)
512+
else:
513+
logger.warning(
514+
"A 'media' listener is configured but the media"
515+
" repository is disabled. Ignoring."
516+
)
511517

512518
if name == "openid" and "federation" not in res["names"]:
513519
# Only load the openid resource separately if federation resource

0 commit comments

Comments
 (0)