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

Commit 2769ef4

Browse files
Revert the general exception recording introduced in #13814 (#13969)
* Maybe not catch all errors to avoid things in the nature-of CancelledError See #13815 (comment) * Remove general exception tracking * Add changelog
1 parent a52c40e commit 2769ef4

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

changelog.d/13969.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Revert catch-all exceptions being recorded as event pull attempt failures (only handle what we know about).

synapse/handlers/federation_event.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -866,11 +866,6 @@ async def _process_pulled_event(
866866
event.room_id, event_id, str(err)
867867
)
868868
return
869-
except Exception as exc:
870-
await self._store.record_event_failed_pull_attempt(
871-
event.room_id, event_id, str(exc)
872-
)
873-
raise exc
874869

875870
try:
876871
try:
@@ -913,11 +908,6 @@ async def _process_pulled_event(
913908
logger.warning("Pulled event %s failed history check.", event_id)
914909
else:
915910
raise
916-
except Exception as exc:
917-
await self._store.record_event_failed_pull_attempt(
918-
event.room_id, event_id, str(exc)
919-
)
920-
raise exc
921911

922912
@trace
923913
async def _compute_event_context_with_maybe_missing_prevs(

0 commit comments

Comments
 (0)