Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add logging when request fails and clarify we ignore errors.

This commit is contained in:
Erik Johnston 2019-06-05 11:31:27 +01:00
parent fde37e4e98
commit bc3d6b918b
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
synapse/handlers/federation.py
View File

@ -2034,8 +2034,14 @@ class FederationHandler(BaseHandler):
) )
except Exception: except Exception:
# We don't really mind if the above fails, so lets not fail # We don't really mind if the above fails, so lets not fail
# processing if it does. # processing if it does. However, it really shouldn't fail so
logger.exception("Failed to call _update_auth_events_and_context_for_auth") # let's still log as an exception since we'll still want to fix
# any bugs.
logger.exception(
"Failed to double check auth events for %s with remote. "
"Ignoring failure and continuing processing of event.",
event.event_id,
)
try: try:
self.auth.check(room_version, event, auth_events=auth_events) self.auth.check(room_version, event, auth_events=auth_events)
@ -2108,9 +2114,10 @@ class FederationHandler(BaseHandler):
remote_auth_chain = yield self.federation_client.get_event_auth( remote_auth_chain = yield self.federation_client.get_event_auth(
origin, event.room_id, event.event_id origin, event.room_id, event.event_id
) )
except RequestSendFailed: except RequestSendFailed as e:
# The other side isn't around or doesn't implement the # The other side isn't around or doesn't implement the
# endpoint, so lets just bail out. # endpoint, so lets just bail out.
logger.info("Failed to get event auth from remote: %s", e)
return return
seen_remotes = yield self.store.have_seen_events( seen_remotes = yield self.store.have_seen_events(
@ -2264,9 +2271,10 @@ class FederationHandler(BaseHandler):
event.event_id, event.event_id,
local_auth_chain, local_auth_chain,
) )
except RequestSendFailed: except RequestSendFailed as e:
# The other side isn't around or doesn't implement the # The other side isn't around or doesn't implement the
# endpoint, so lets just bail out. # endpoint, so lets just bail out.
logger.info("Failed to query auth from remote: %s", e)
return return
seen_remotes = yield self.store.have_seen_events( seen_remotes = yield self.store.have_seen_events(