Skip to content
Snippets Groups Projects
Unverified Commit 7620912d authored by Erik Johnston's avatar Erik Johnston Committed by GitHub
Browse files

Add health check endpoint (#8048)

parent 4dd27e6d
No related branches found
No related tags found
No related merge requests found
Add a `/health` endpoint to every configured HTTP listener that can be used as a health check endpoint by load balancers.
...@@ -139,3 +139,10 @@ client IP addresses are recorded correctly. ...@@ -139,3 +139,10 @@ client IP addresses are recorded correctly.
Having done so, you can then use `https://matrix.example.com` (instead Having done so, you can then use `https://matrix.example.com` (instead
of `https://matrix.example.com:8448`) as the "Custom server" when of `https://matrix.example.com:8448`) as the "Custom server" when
connecting to Synapse from a client. connecting to Synapse from a client.
## Health check endpoint
Synapse exposes a health check endpoint for use by reverse proxies.
Each configured HTTP listener has a `/health` endpoint which always returns
200 OK (and doesn't get logged).
...@@ -123,6 +123,7 @@ from synapse.rest.client.v2_alpha.account_data import ( ...@@ -123,6 +123,7 @@ from synapse.rest.client.v2_alpha.account_data import (
from synapse.rest.client.v2_alpha.keys import KeyChangesServlet, KeyQueryServlet from synapse.rest.client.v2_alpha.keys import KeyChangesServlet, KeyQueryServlet
from synapse.rest.client.v2_alpha.register import RegisterRestServlet from synapse.rest.client.v2_alpha.register import RegisterRestServlet
from synapse.rest.client.versions import VersionsRestServlet from synapse.rest.client.versions import VersionsRestServlet
from synapse.rest.health import HealthResource
from synapse.rest.key.v2 import KeyApiV2Resource from synapse.rest.key.v2 import KeyApiV2Resource
from synapse.server import HomeServer from synapse.server import HomeServer
from synapse.storage.databases.main.censor_events import CensorEventsStore from synapse.storage.databases.main.censor_events import CensorEventsStore
...@@ -493,7 +494,10 @@ class GenericWorkerServer(HomeServer): ...@@ -493,7 +494,10 @@ class GenericWorkerServer(HomeServer):
site_tag = listener_config.http_options.tag site_tag = listener_config.http_options.tag
if site_tag is None: if site_tag is None:
site_tag = port site_tag = port
resources = {}
# We always include a health resource.
resources = {"/health": HealthResource()}
for res in listener_config.http_options.resources: for res in listener_config.http_options.resources:
for name in res.names: for name in res.names:
if name == "metrics": if name == "metrics":
......
...@@ -68,6 +68,7 @@ from synapse.replication.http import REPLICATION_PREFIX, ReplicationRestResource ...@@ -68,6 +68,7 @@ from synapse.replication.http import REPLICATION_PREFIX, ReplicationRestResource
from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory
from synapse.rest import ClientRestResource from synapse.rest import ClientRestResource
from synapse.rest.admin import AdminRestResource from synapse.rest.admin import AdminRestResource
from synapse.rest.health import HealthResource
from synapse.rest.key.v2 import KeyApiV2Resource from synapse.rest.key.v2 import KeyApiV2Resource
from synapse.rest.well_known import WellKnownResource from synapse.rest.well_known import WellKnownResource
from synapse.server import HomeServer from synapse.server import HomeServer
...@@ -98,7 +99,9 @@ class SynapseHomeServer(HomeServer): ...@@ -98,7 +99,9 @@ class SynapseHomeServer(HomeServer):
if site_tag is None: if site_tag is None:
site_tag = port site_tag = port
resources = {} # We always include a health resource.
resources = {"/health": HealthResource()}
for res in listener_config.http_options.resources: for res in listener_config.http_options.resources:
for name in res.names: for name in res.names:
if name == "openid" and "federation" in res.names: if name == "openid" and "federation" in res.names:
......
...@@ -286,7 +286,9 @@ class SynapseRequest(Request): ...@@ -286,7 +286,9 @@ class SynapseRequest(Request):
# the connection dropped) # the connection dropped)
code += "!" code += "!"
self.site.access_logger.info( log_level = logging.INFO if self._should_log_request() else logging.DEBUG
self.site.access_logger.log(
log_level,
"%s - %s - {%s}" "%s - %s - {%s}"
" Processed request: %.3fsec/%.3fsec (%.3fsec, %.3fsec) (%.3fsec/%.3fsec/%d)" " Processed request: %.3fsec/%.3fsec (%.3fsec, %.3fsec) (%.3fsec/%.3fsec/%d)"
' %sB %s "%s %s %s" "%s" [%d dbevts]', ' %sB %s "%s %s %s" "%s" [%d dbevts]',
...@@ -314,6 +316,11 @@ class SynapseRequest(Request): ...@@ -314,6 +316,11 @@ class SynapseRequest(Request):
except Exception as e: except Exception as e:
logger.warning("Failed to stop metrics: %r", e) logger.warning("Failed to stop metrics: %r", e)
def _should_log_request(self) -> bool:
"""Whether we should log at INFO that we processed the request.
"""
return self.path != b"/health"
class XForwardedForRequest(SynapseRequest): class XForwardedForRequest(SynapseRequest):
def __init__(self, *args, **kw): def __init__(self, *args, **kw):
......
# -*- coding: utf-8 -*-
# Copyright 2020 The Matrix.org Foundation C.I.C.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from twisted.web.resource import Resource
class HealthResource(Resource):
"""A resource that does nothing except return a 200 with a body of `OK`,
which can be used as a health check.
Note: `SynapseRequest._should_log_request` ensures that requests to
`/health` do not get logged at INFO.
"""
isLeaf = 1
def render_GET(self, request):
request.setHeader(b"Content-Type", b"text/plain")
return b"OK"
# -*- coding: utf-8 -*-
# Copyright 2020 The Matrix.org Foundation C.I.C.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from synapse.rest.health import HealthResource
from tests import unittest
class HealthCheckTests(unittest.HomeserverTestCase):
def setUp(self):
super().setUp()
# replace the JsonResource with a HealthResource.
self.resource = HealthResource()
def test_health(self):
request, channel = self.make_request("GET", "/health", shorthand=False)
self.render(request)
self.assertEqual(request.code, 200)
self.assertEqual(channel.result["body"], b"OK")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment