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

Fetcher timeouts

Browse source
This commit is contained in:
Neil Alexander 2020-06-15 16:42:14 +01:00
parent 1efab75853
commit d4e30f2838
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
serverkeyapi/internal/api.go
View file

@ -135,6 +135,8 @@ func (s *ServerKeyAPI) FetchKeys(
// fetch them directly. We'll go through each of the key fetchers to // fetch them directly. We'll go through each of the key fetchers to
// ask for the remaining keys. // ask for the remaining keys.
for _, fetcher := range s.OurKeyRing.KeyFetchers { for _, fetcher := range s.OurKeyRing.KeyFetchers {
fetcherCtx, fetcherCancel := context.WithTimeout(ctx, time.Second*10)
defer fetcherCancel()
// If there are no more keys to look up then stop. // If there are no more keys to look up then stop.
if len(requests) == 0 { if len(requests) == 0 {
break break
@ -142,7 +144,7 @@ func (s *ServerKeyAPI) FetchKeys(
logrus.WithFields(logrus.Fields{ logrus.WithFields(logrus.Fields{
"fetcher_name": fetcher.FetcherName(), "fetcher_name": fetcher.FetcherName(),
}).Infof("Fetching %d key(s)", len(requests)) }).Infof("Fetching %d key(s)", len(requests))
if fetcherResults, err := fetcher.FetchKeys(ctx, requests); err == nil { if fetcherResults, err := fetcher.FetchKeys(fetcherCtx, requests); err == nil {
// Build a map of the results that we want to commit to the // Build a map of the results that we want to commit to the
// database. We do this in a separate map because otherwise we // database. We do this in a separate map because otherwise we
// might end up trying to rewrite database entries. // might end up trying to rewrite database entries.
@ -208,7 +210,7 @@ func (s *ServerKeyAPI) FetchKeys(
} }
} }
// Return the keys. // Return the keys.
logrus.Infof("Retrieved %d key(s)", len(origRequests)) logrus.Infof("Retrieved %d key(s) for %d request(s)", len(results), len(origRequests))
return results, nil return results, nil
} }