From 6f49758b90d655d9c2bb9170da2ea1d0a2bdd664 Mon Sep 17 00:00:00 2001 From: Kegsay Date: Tue, 30 Jun 2020 13:34:59 +0100 Subject: Remove membership table from account DB (#1172) * Remove membership table from account DB And make code which needs that data use the currentstate server * Unbreak tests; use a membership enum for space --- cmd/dendrite-monolith-server/main.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'cmd/dendrite-monolith-server/main.go') diff --git a/cmd/dendrite-monolith-server/main.go b/cmd/dendrite-monolith-server/main.go index 339bbe69..905eda2b 100644 --- a/cmd/dendrite-monolith-server/main.go +++ b/cmd/dendrite-monolith-server/main.go @@ -20,6 +20,7 @@ import ( "os" "github.com/matrix-org/dendrite/appservice" + "github.com/matrix-org/dendrite/currentstateserver" "github.com/matrix-org/dendrite/eduserver" "github.com/matrix-org/dendrite/eduserver/cache" "github.com/matrix-org/dendrite/federationsender" @@ -122,6 +123,8 @@ func main() { logrus.WithError(err).Panicf("failed to connect to public rooms db") } + stateAPI := currentstateserver.NewInternalAPI(base.Cfg, base.KafkaConsumer) + monolith := setup.Monolith{ Config: base.Cfg, AccountDB: accountDB, @@ -137,6 +140,7 @@ func main() { FederationSenderAPI: fsAPI, RoomserverAPI: rsAPI, ServerKeyAPI: serverKeyAPI, + StateAPI: stateAPI, UserAPI: userAPI, PublicRoomsDB: publicRoomsDB, -- cgit v1.2.3