diff options
| author | Kegsay <kegan@matrix.org> | 2020-06-30 13:34:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-30 13:34:59 +0100 |
| commit | 6f49758b90d655d9c2bb9170da2ea1d0a2bdd664 (patch) | |
| tree | f434cc48f27c3915fffdb39c5b907fd021d4ff61 /cmd/dendrite-monolith-server/main.go | |
| parent | ca5bbffd8d987b220c8f8eb888a2fc9b9cef104c (diff) | |
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
Diffstat (limited to 'cmd/dendrite-monolith-server/main.go')
| -rw-r--r-- | cmd/dendrite-monolith-server/main.go | 4 |
1 files changed, 4 insertions, 0 deletions
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, |