tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

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

Browse source 
Correctly log expected errors when fetching server keys
This commit is contained in:
Erik Johnston 2019-03-11 17:12:20 +00:00 committed by GitHub
commit 9c0e6e8e7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/4847.misc Normal file
View file

@ -0,0 +1 @@
Correctly log expected errors when fetching server keys.

4
synapse/crypto/keyring.py
View file

@ -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(