aboutsummaryrefslogtreecommitdiff
path: root/keyserver/keyserver.go
diff options
context:
space:
mode:
authorKegsay <kegan@matrix.org>2020-07-23 16:41:36 +0100
committerGitHub <noreply@github.com>2020-07-23 16:41:36 +0100
commit98f2f09bb46f8bd126214f7874065d6b311bdeba (patch)
tree89108a41fe96e5d0a6dbd4f1d5e91c0b5263fc2e /keyserver/keyserver.go
parent7b862384a779f067f07ffeb2151856f89d372732 (diff)
keyserver: produce key change events (#1218)
* Produce kafka events when keys are added * Consume key changes in syncapi with TODO markers for handling them and catching up * unbreak tests * Linting
Diffstat (limited to 'keyserver/keyserver.go')
-rw-r--r--keyserver/keyserver.go11
1 files changed, 10 insertions, 1 deletions
diff --git a/keyserver/keyserver.go b/keyserver/keyserver.go
index 2e1ddb6c..47c6a8c3 100644
--- a/keyserver/keyserver.go
+++ b/keyserver/keyserver.go
@@ -15,11 +15,13 @@
package keyserver
import (
+ "github.com/Shopify/sarama"
"github.com/gorilla/mux"
"github.com/matrix-org/dendrite/internal/config"
"github.com/matrix-org/dendrite/keyserver/api"
"github.com/matrix-org/dendrite/keyserver/internal"
"github.com/matrix-org/dendrite/keyserver/inthttp"
+ "github.com/matrix-org/dendrite/keyserver/producers"
"github.com/matrix-org/dendrite/keyserver/storage"
userapi "github.com/matrix-org/dendrite/userapi/api"
"github.com/matrix-org/gomatrixserverlib"
@@ -34,7 +36,9 @@ func AddInternalRoutes(router *mux.Router, intAPI api.KeyInternalAPI) {
// NewInternalAPI returns a concerete implementation of the internal API. Callers
// can call functions directly on the returned API or via an HTTP interface using AddInternalRoutes.
-func NewInternalAPI(cfg *config.Dendrite, fedClient *gomatrixserverlib.FederationClient, userAPI userapi.UserInternalAPI) api.KeyInternalAPI {
+func NewInternalAPI(
+ cfg *config.Dendrite, fedClient *gomatrixserverlib.FederationClient, userAPI userapi.UserInternalAPI, producer sarama.SyncProducer,
+) api.KeyInternalAPI {
db, err := storage.NewDatabase(
string(cfg.Database.E2EKey),
cfg.DbProperties(),
@@ -42,10 +46,15 @@ func NewInternalAPI(cfg *config.Dendrite, fedClient *gomatrixserverlib.Federatio
if err != nil {
logrus.WithError(err).Panicf("failed to connect to key server database")
}
+ keyChangeProducer := &producers.KeyChange{
+ Topic: string(cfg.Kafka.Topics.OutputKeyChangeEvent),
+ Producer: producer,
+ }
return &internal.KeyInternalAPI{
DB: db,
ThisServer: cfg.Matrix.ServerName,
FedClient: fedClient,
UserAPI: userAPI,
+ Producer: keyChangeProducer,
}
}