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

Merge pull request #4847 from matrix-org/erikj/fix_stacktrace_keyring

Correctly log expected errors when fetching server keys
parents b61ac966 33dfd9a2
No related branches found
Tags v1.34.0
No related merge requests found
Correctly log expected errors when fetching server keys.
...@@ -686,9 +686,9 @@ def _handle_key_deferred(verify_request): ...@@ -686,9 +686,9 @@ def _handle_key_deferred(verify_request):
try: try:
with PreserveLoggingContext(): with PreserveLoggingContext():
_, key_id, verify_key = yield verify_request.deferred _, key_id, verify_key = yield verify_request.deferred
except (IOError, RequestSendFailed) as e: except KeyLookupError as e:
logger.warn( logger.warn(
"Got IOError when downloading keys for %s: %s %s", "Failed to download keys for %s: %s %s",
server_name, type(e).__name__, str(e), server_name, type(e).__name__, str(e),
) )
raise SynapseError( raise SynapseError(
......
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