diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-05-21 16:10:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-21 16:10:54 +0100 |
| commit | c4aef549ad1f55661675a789f89fe9e041fac874 (patch) | |
| tree | 0a9c7e729a74219965da16eb9b9df88ebe98e994 /synapse/handlers/federation.py | |
| parent | Pin eliot to <1.8 on python 3.5.2 (#5218) (diff) | |
| download | synapse-c4aef549ad1f55661675a789f89fe9e041fac874.tar.xz | |
Exclude soft-failed events from fwd-extremity candidates. (#5146)
When considering the candidates to be forward-extremities, we must exclude soft failures. Hopefully fixes #5090.
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 0684778882..2202ed699a 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1916,6 +1916,11 @@ class FederationHandler(BaseHandler): event.room_id, latest_event_ids=extrem_ids, ) + logger.debug( + "Doing soft-fail check for %s: state %s", + event.event_id, current_state_ids, + ) + # Now check if event pass auth against said current state auth_types = auth_types_for_event(event) current_state_ids = [ @@ -1932,7 +1937,7 @@ class FederationHandler(BaseHandler): self.auth.check(room_version, event, auth_events=current_auth_events) except AuthError as e: logger.warn( - "Failed current state auth resolution for %r because %s", + "Soft-failing %r because %s", event, e, ) event.internal_metadata.soft_failed = True |