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

Debug logging

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

23
serverkeyapi/internal/api.go
View file

@ -131,9 +131,13 @@ 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 {
// If there are no more keys to look up then stop.
if len(requests) == 0 {
break
}
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(ctx, 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
@ -170,19 +174,19 @@ func (s *ServerKeyAPI) FetchKeys(
} }
// Store the keys from our store map. // Store the keys from our store map.
if err = s.OurKeyRing.KeyDatabase.StoreKeys(ctx, storeResults); err != nil { if err = s.OurKeyRing.KeyDatabase.StoreKeys(ctx, storeResults); err != nil {
logrus.WithError(err).WithFields(logrus.Fields{
"fetcher_name": fetcher.FetcherName(),
"database_name": s.OurKeyRing.KeyDatabase.FetcherName(),
}).Errorf("Failed to store keys in the database")
return nil, fmt.Errorf("server key API failed to store retrieved keys: %w", err) return nil, fmt.Errorf("server key API failed to store retrieved keys: %w", err)
} }
logrus.WithFields(logrus.Fields{
"fetcher_name": fetcher.FetcherName(),
}).Infof("Retrieved %d key(s) and stored %d key(s)", len(results), len(storeResults))
} else { } else {
logrus.WithError(err).WithFields(logrus.Fields{ logrus.WithError(err).WithFields(logrus.Fields{
"fetcher_name": fetcher.FetcherName(), "fetcher_name": fetcher.FetcherName(),
}).Warnf("failed to retrieve %d key(s)", len(requests)) }).Errorf("Failed to retrieve %d key(s)", len(requests))
}
// If there are no more keys to look up then stop.
if len(requests) == 0 {
logrus.WithFields(logrus.Fields{
"fetcher_name": fetcher.FetcherName(),
}).Infof("all keys are up-to-date")
break
} }
} }
// 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
@ -192,6 +196,7 @@ func (s *ServerKeyAPI) FetchKeys(
// 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
// all of the fetchers. Report an error. // all of the fetchers. Report an error.
logrus.Warnf("Failed to retrieve key %q for server %q", req.KeyID, req.ServerName)
return results, fmt.Errorf( return results, fmt.Errorf(
"server key API failed to satisfy key request for server %q key ID %q", "server key API failed to satisfy key request for server %q key ID %q",
req.ServerName, req.KeyID, req.ServerName, req.KeyID,