Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Correctly log expected errors when fetching server keys #4847

Merged
merged 2 commits into from
Mar 11, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/4847.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Correctly log expected errors when fetching server keys.
4 changes: 2 additions & 2 deletions synapse/crypto/keyring.py
Original file line number Diff line number Diff line change
@@ -686,9 +686,9 @@ def _handle_key_deferred(verify_request):
try:
with PreserveLoggingContext():
_, key_id, verify_key = yield verify_request.deferred
except (IOError, RequestSendFailed) as e:
except KeyLookupError as e:
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),
)
raise SynapseError(