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

Debug logging

Browse source
This commit is contained in:
Neil Alexander 2020-06-15 15:53:10 +01:00
parent 5c7a4571de
commit f38ae82826
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
serverkeyapi/internal/api.go
View file

@ -10,6 +10,7 @@ import (
"github.com/matrix-org/dendrite/internal/config" "github.com/matrix-org/dendrite/internal/config"
"github.com/matrix-org/dendrite/serverkeyapi/api" "github.com/matrix-org/dendrite/serverkeyapi/api"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/sirupsen/logrus"
) )
type ServerKeyAPI struct { type ServerKeyAPI struct {
@ -130,9 +131,9 @@ 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 len(requests) == 0 { logrus.WithFields(logrus.Fields{
break "fetcher_name": fetcher.FetcherName(),
} }).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
@ -171,6 +172,17 @@ func (s *ServerKeyAPI) FetchKeys(
if err = s.OurKeyRing.KeyDatabase.StoreKeys(ctx, storeResults); err != nil { if err = s.OurKeyRing.KeyDatabase.StoreKeys(ctx, storeResults); err != nil {
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)
} }
} else {
logrus.WithError(err).WithFields(logrus.Fields{
"fetcher_name": fetcher.FetcherName(),
}).Warnf("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