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

Output number of configured keys for perspective

Browse source
This commit is contained in:
Neil Alexander 2020-04-20 15:05:42 +01:00
parent 08429b89f0
commit a3c1adc2a9
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/keydb/keyring.go
View file

@ -15,12 +15,10 @@
package keydb package keydb
import ( import (
"context"
"encoding/base64" "encoding/base64"
"github.com/matrix-org/dendrite/common/config" "github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/util"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/crypto/ed25519" "golang.org/x/crypto/ed25519"
) )
@ -42,7 +40,7 @@ func CreateKeyRing(client gomatrixserverlib.Client,
KeyDatabase: keyDB, KeyDatabase: keyDB,
} }
util.GetLogger(context.TODO()).Info("Enabled direct key fetcher") logrus.Info("Enabled direct key fetcher")
var b64e = base64.StdEncoding.WithPadding(base64.NoPadding) var b64e = base64.StdEncoding.WithPadding(base64.NoPadding)
for _, ps := range cfg.Matrix.KeyPerspectives { for _, ps := range cfg.Matrix.KeyPerspectives {
@ -55,7 +53,7 @@ func CreateKeyRing(client gomatrixserverlib.Client,
for _, key := range ps.Keys { for _, key := range ps.Keys {
rawkey, err := b64e.DecodeString(key.PublicKey) rawkey, err := b64e.DecodeString(key.PublicKey)
if err != nil { if err != nil {
util.GetLogger(context.TODO()).WithError(err).WithFields(logrus.Fields{ logrus.WithError(err).WithFields(logrus.Fields{
"server_name": ps.ServerName, "server_name": ps.ServerName,
"public_key": key.PublicKey, "public_key": key.PublicKey,
}).Warn("Couldn't parse perspective key") }).Warn("Couldn't parse perspective key")
@ -64,7 +62,10 @@ func CreateKeyRing(client gomatrixserverlib.Client,
perspective.PerspectiveServerKeys[key.KeyID] = rawkey perspective.PerspectiveServerKeys[key.KeyID] = rawkey
} }
util.GetLogger(context.TODO()).WithField("server_name", ps.ServerName).Info("Enabled perspective key fetcher") logrus.WithFields(logrus.Fields{
"server_name": ps.ServerName,
"num_public_keys": len(ps.Keys),
}).Info("Enabled perspective key fetcher")
} }
return fetchers return fetchers