diff options
| author | Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> | 2023-01-11 13:00:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-11 12:00:38 +0000 |
| commit | 73f097888eedaad05eda6b2453b6558158c0b032 (patch) | |
| tree | bdfc50b056c6200be5a1a5d79b175c3efc399a37 /synapse | |
| parent | Add poetry.toml to .gitignore (#14807) (diff) | |
| download | synapse-73f097888eedaad05eda6b2453b6558158c0b032.tar.xz | |
Add listener `health` (#14747)
Fixes: #8780
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/app/generic_worker.py | 3 | ||||
| -rw-r--r-- | synapse/app/homeserver.py | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py index bcc8abe20c..8108b1e98f 100644 --- a/synapse/app/generic_worker.py +++ b/synapse/app/generic_worker.py @@ -199,6 +199,9 @@ class GenericWorkerServer(HomeServer): "A 'media' listener is configured but the media" " repository is disabled. Ignoring." ) + elif name == "health": + # Skip loading, health resource is always included + continue if name == "openid" and "federation" not in res.names: # Only load the openid resource separately if federation resource diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index b9be558c7e..6176a70eb2 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -96,6 +96,9 @@ class SynapseHomeServer(HomeServer): # Skip loading openid resource if federation is defined # since federation resource will include openid continue + if name == "health": + # Skip loading, health resource is always included + continue resources.update(self._configure_named_resource(name, res.compress)) additional_resources = listener_config.http_options.additional_resources |