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

Commit

Permalink
Maybe not catch all errors to avoid things in the nature-of Cancelled…
Browse files Browse the repository at this point in the history
…Error

See #13815 (comment)
  • Loading branch information
MadLittleMods committed Sep 30, 2022
1 parent 6f0c3e6 commit fd38996
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 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,7 +908,7 @@ async def _process_pulled_event(
logger.warning("Pulled event %s failed history check.", event_id)
else:
raise
except Exception as exc:
except (FederationError, RuntimeError, InvalidResponseError) as exc:
await self._store.record_event_failed_pull_attempt(
event.room_id, event_id, str(exc)
)
Expand Down

0 comments on commit fd38996

Please sign in to comment.