summary refs log tree commit diff
path: root/synapse/api/auth.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-11-19 12:59:39 +0000
committerErik Johnston <erik@matrix.org>2019-11-19 12:59:39 +0000
commit6d1a3e2bdddae4a9202cec590f87b6ccb0489879 (patch)
treeebad42c2198d0dcb4c2164fc27366c8a094077bc /synapse/api/auth.py
parentMerge branch 'rav/url_preview_limit_title_2' into matrix-org-hotfixes (diff)
parentReplace UPDATE with UPSERT on device_max_stream_id table (#6363) (diff)
downloadsynapse-6d1a3e2bdddae4a9202cec590f87b6ccb0489879.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/api/auth.py')
-rw-r--r--synapse/api/auth.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py

index 53f3bb0fa8..5d0b7d2801 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py
@@ -497,7 +497,7 @@ class Auth(object): token = self.get_access_token_from_request(request) service = self.store.get_app_service_by_token(token) if not service: - logger.warn("Unrecognised appservice access token.") + logger.warning("Unrecognised appservice access token.") raise InvalidClientTokenError() request.authenticated_entity = service.sender return defer.succeed(service)