diff options
| author | Erik Johnston <erikj@jki.re> | 2016-08-10 10:56:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-10 10:56:08 +0100 |
| commit | d45489474d0e9ee2451c04654f007a659c5d2ef6 (patch) | |
| tree | d92a8abe1d05c5b7e6508c2568444a3a47402fe5 /synapse/rest | |
| parent | /login: Respond with a 403 when we get an invalid m.login.token (diff) | |
| parent | Don't print stack traces when failing to get remote keys (diff) | |
| download | synapse-d45489474d0e9ee2451c04654f007a659c5d2ef6.tar.xz | |
Merge pull request #996 from matrix-org/erikj/tls_error
Don't print stack traces when failing to get remote keys
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/key/v2/remote_key_resource.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/rest/key/v2/remote_key_resource.py b/synapse/rest/key/v2/remote_key_resource.py index 7209d5a37d..9fe2013657 100644 --- a/synapse/rest/key/v2/remote_key_resource.py +++ b/synapse/rest/key/v2/remote_key_resource.py @@ -15,6 +15,7 @@ from synapse.http.server import request_handler, respond_with_json_bytes from synapse.http.servlet import parse_integer, parse_json_object_from_request from synapse.api.errors import SynapseError, Codes +from synapse.crypto.keyring import KeyLookupError from twisted.web.resource import Resource from twisted.web.server import NOT_DONE_YET @@ -210,9 +211,10 @@ class RemoteKey(Resource): yield self.keyring.get_server_verify_key_v2_direct( server_name, key_ids ) + except KeyLookupError as e: + logger.info("Failed to fetch key: %s", e) except: logger.exception("Failed to get key for %r", server_name) - pass yield self.query_keys( request, query, query_remote_on_cache_miss=False ) |