mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-20 21:33:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Don't prematurely stop trying to join using servers

Browse source
This commit is contained in:
Neil Alexander 2020-05-15 12:16:38 +01:00
parent 773d5bb9f9
commit ba34f73c82
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
federationsender/internal/perform.go
View file

@ -64,7 +64,8 @@ func (r *FederationSenderInternalAPI) PerformJoin(
if err != nil { if err != nil {
// TODO: Check if the user was not allowed to join the room. // TODO: Check if the user was not allowed to join the room.
r.statistics.ForServer(serverName).Failure() r.statistics.ForServer(serverName).Failure()
return fmt.Errorf("r.federation.MakeJoin: %w", err) logrus.WithError(err).Errorf("r.federation.MakeJoin failed")
continue
} }
// Set all the fields to be what they should be, this should be a no-op // Set all the fields to be what they should be, this should be a no-op
@ -79,10 +80,12 @@ func (r *FederationSenderInternalAPI) PerformJoin(
} }
request.Content["membership"] = "join" request.Content["membership"] = "join"
if err = respMakeJoin.JoinEvent.SetContent(request.Content); err != nil { if err = respMakeJoin.JoinEvent.SetContent(request.Content); err != nil {
return fmt.Errorf("respMakeJoin.JoinEvent.SetContent: %w", err) logrus.WithError(err).Errorf("respMakeJoin.JoinEvent.SetContent failed")
continue
} }
if err = respMakeJoin.JoinEvent.SetUnsigned(struct{}{}); err != nil { if err = respMakeJoin.JoinEvent.SetUnsigned(struct{}{}); err != nil {
return fmt.Errorf("respMakeJoin.JoinEvent.SetUnsigned: %w", err) logrus.WithError(err).Errorf("respMakeJoin.JoinEvent.SetUnsigned failed")
continue
} }
// Work out if we support the room version that has been supplied in // Work out if we support the room version that has been supplied in
@ -91,7 +94,8 @@ func (r *FederationSenderInternalAPI) PerformJoin(
respMakeJoin.RoomVersion = gomatrixserverlib.RoomVersionV1 respMakeJoin.RoomVersion = gomatrixserverlib.RoomVersionV1
} }
if _, err = respMakeJoin.RoomVersion.EventFormat(); err != nil { if _, err = respMakeJoin.RoomVersion.EventFormat(); err != nil {
return fmt.Errorf("respMakeJoin.RoomVersion.EventFormat: %w", err) logrus.WithError(err).Errorf("respMakeJoin.RoomVersion.EventFormat failed")
continue
} }
// Build the join event. // Build the join event.
@ -103,7 +107,8 @@ func (r *FederationSenderInternalAPI) PerformJoin(
respMakeJoin.RoomVersion, respMakeJoin.RoomVersion,
) )
if err != nil { if err != nil {
return fmt.Errorf("respMakeJoin.JoinEvent.Build: %w", err) logrus.WithError(err).Errorf("respMakeJoin.JoinEvent.Build failed")
continue
} }
// Try to perform a send_join using the newly built event. // Try to perform a send_join using the newly built event.