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

Perform final comparison against original set of requests

Browse source
This commit is contained in:
Neil Alexander 2020-06-15 16:35:25 +01:00
parent 0a92c1f5ce
commit 2e2cece7e3
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
serverkeyapi/internal/api.go
View file

@ -78,6 +78,10 @@ func (s *ServerKeyAPI) FetchKeys(
// because the caller gives up waiting. // because the caller gives up waiting.
ctx := context.Background() ctx := context.Background()
results := map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult{} results := map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult{}
origRequests := map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult{}
for k, v := range requests {
origRequests[k] = v
}
now := gomatrixserverlib.AsTimestamp(time.Now()) now := gomatrixserverlib.AsTimestamp(time.Now())
// First, check if any of these key checks are for our own keys. If // First, check if any of these key checks are for our own keys. If
// they are then we will satisfy them directly. // they are then we will satisfy them directly.
@ -182,7 +186,7 @@ func (s *ServerKeyAPI) FetchKeys(
} }
logrus.WithFields(logrus.Fields{ logrus.WithFields(logrus.Fields{
"fetcher_name": fetcher.FetcherName(), "fetcher_name": fetcher.FetcherName(),
}).Infof("Retrieved %d key(s) and stored %d key(s)", len(results), len(storeResults)) }).Infof("Updated %d of %d key(s) in database", len(storeResults), len(results))
} else { } else {
logrus.WithError(err).WithFields(logrus.Fields{ logrus.WithError(err).WithFields(logrus.Fields{
"fetcher_name": fetcher.FetcherName(), "fetcher_name": fetcher.FetcherName(),
@ -191,7 +195,7 @@ func (s *ServerKeyAPI) FetchKeys(
} }
// Check that we've actually satisfied all of the key requests that we // Check that we've actually satisfied all of the key requests that we
// were given. We should report an error if we didn't. // were given. We should report an error if we didn't.
for req := range requests { for req := range origRequests {
if _, ok := results[req]; !ok { if _, ok := results[req]; !ok {
// The results don't contain anything for this specific request, so // The results don't contain anything for this specific request, so
// we've failed to satisfy it from local keys, database keys or from // we've failed to satisfy it from local keys, database keys or from
@ -204,6 +208,7 @@ func (s *ServerKeyAPI) FetchKeys(
} }
} }
// Return the keys. // Return the keys.
logrus.Infof("Retrieved %d key(s)", len(origRequests))
return results, nil return results, nil
} }