hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2024-12-27 23:48:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Deduplicate server names

Browse source
This commit is contained in:
Neil Alexander 2021-06-22 10:43:40 +01:00
parent fee5074f15
commit 161857d9b7
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
federationapi/routing/send.go
View file

@ -482,18 +482,29 @@ func (t *txnReq) getServers(ctx context.Context, roomID string, eventOrigin goma
if t.servers != nil { if t.servers != nil {
return t.servers return t.servers
} }
dedupe := map[gomatrixserverlib.ServerName]struct{}{}
t.servers = []gomatrixserverlib.ServerName{t.Origin} // transaction origin t.servers = []gomatrixserverlib.ServerName{t.Origin} // transaction origin
dedupe[t.Origin] = struct{}{}
if eventOrigin != "" { if eventOrigin != "" {
t.servers = append(t.servers, eventOrigin) // event origin, if specified if _, ok := dedupe[eventOrigin]; !ok {
t.servers = append(t.servers, eventOrigin) // event origin, if specified
dedupe[eventOrigin] = struct{}{}
}
} }
serverReq := &api.QueryServerJoinedToRoomRequest{ serverReq := &api.QueryServerJoinedToRoomRequest{
RoomID: roomID, RoomID: roomID,
} }
serverRes := &api.QueryServerJoinedToRoomResponse{} serverRes := &api.QueryServerJoinedToRoomResponse{}
if err := t.rsAPI.QueryServerJoinedToRoom(ctx, serverReq, serverRes); err == nil { if err := t.rsAPI.QueryServerJoinedToRoom(ctx, serverReq, serverRes); err == nil {
t.servers = append(t.servers, serverRes.ServerNames...) for _, server := range serverRes.ServerNames {
if _, ok := dedupe[server]; !ok {
t.servers = append(t.servers, server)
dedupe[server] = struct{}{}
}
}
util.GetLogger(ctx).Infof("Found %d server(s) to query for missing events in %q", len(t.servers), roomID) util.GetLogger(ctx).Infof("Found %d server(s) to query for missing events in %q", len(t.servers), roomID)
} }
return t.servers return t.servers
} }