mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 18:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Handle new FederationError type in PerformJoin

Browse source
This commit is contained in:
Devon Hudson 2023-04-25 12:38:27 -06:00
parent 1e174e04eb
commit 53787d539d
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
federationapi/internal/perform.go
View file

@ -161,19 +161,17 @@ func (r *FederationInternalAPI) performJoinUsingServer(
KeyRing: r.keyRing, KeyRing: r.keyRing,
EventProvider: federatedEventProvider(ctx, r.federation, r.keyRing, user.Domain(), serverName), EventProvider: federatedEventProvider(ctx, r.federation, r.keyRing, user.Domain(), serverName),
} }
callbacks := fclient.PerformJoinCallbacks{ response, joinErr := fclient.PerformJoin(ctx, r.federation, joinInput)
FederationFailure: func(server spec.ServerName) {
r.statistics.ForServer(server).Failure()
},
FederationSuccess: func(server spec.ServerName) {
r.statistics.ForServer(server).Success(statistics.SendDirect)
},
}
response, err := fclient.PerformJoin(ctx, r.federation, joinInput, callbacks)
if err != nil { if err != nil {
if !joinErr.Reachable {
r.statistics.ForServer(joinErr.ServerName).Failure()
} else {
r.statistics.ForServer(joinErr.ServerName).Success(statistics.SendDirect)
}
return err return err
} }
r.statistics.ForServer(serverName).Success(statistics.SendDirect)
// We need to immediately update our list of joined hosts for this room now as we are technically // We need to immediately update our list of joined hosts for this room now as we are technically
// joined. We must do this synchronously: we cannot rely on the roomserver output events as they // joined. We must do this synchronously: we cannot rely on the roomserver output events as they