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

Commit

Permalink
Revert the general exception recording introduced in #13814 (#13969)
Browse files Browse the repository at this point in the history
* Maybe not catch all errors to avoid things in the nature-of CancelledError

See #13815 (comment)

* Remove general exception tracking

* Add changelog
  • Loading branch information
MadLittleMods committed Oct 3, 2022
1 parent a52c40e commit 2769ef4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
1 change: 1 addition & 0 deletions changelog.d/13969.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Revert catch-all exceptions being recorded as event pull attempt failures (only handle what we know about).
10 changes: 0 additions & 10 deletions synapse/handlers/federation_event.py
Original file line number Diff line number Diff line change
Expand Up @@ -866,11 +866,6 @@ async def _process_pulled_event(
event.room_id, event_id, str(err)
)
return
except Exception as exc:
await self._store.record_event_failed_pull_attempt(
event.room_id, event_id, str(exc)
)
raise exc

try:
try:
Expand Down Expand Up @@ -913,11 +908,6 @@ async def _process_pulled_event(
logger.warning("Pulled event %s failed history check.", event_id)
else:
raise
except Exception as exc:
await self._store.record_event_failed_pull_attempt(
event.room_id, event_id, str(exc)
)
raise exc

@trace
async def _compute_event_context_with_maybe_missing_prevs(
Expand Down

0 comments on commit 2769ef4

Please sign in to comment.