From 6f8ebc173d651361aae5fcba814c07b7a495f8aa Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Tue, 26 May 2020 15:17:16 +0100 Subject: [PATCH] Wire in new server key API into hybrid monolith mode --- cmd/dendrite-monolith-server/main.go | 3 +++ serverkeyapi/serverkeyapi.go | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/dendrite-monolith-server/main.go b/cmd/dendrite-monolith-server/main.go index 0c6660ecc..2a807161f 100644 --- a/cmd/dendrite-monolith-server/main.go +++ b/cmd/dendrite-monolith-server/main.go @@ -72,6 +72,9 @@ func main() { serverKeyAPI := serverkeyapi.SetupServerKeyAPIComponent( base, federation, ) + if base.EnableHTTPAPIs { + serverKeyAPI = base.CreateHTTPServerKeyAPIs() + } keyRing := serverKeyAPI.KeyRing() rsComponent := roomserver.SetupRoomServerComponent( diff --git a/serverkeyapi/serverkeyapi.go b/serverkeyapi/serverkeyapi.go index 52e47bbe1..3d189ba39 100644 --- a/serverkeyapi/serverkeyapi.go +++ b/serverkeyapi/serverkeyapi.go @@ -5,6 +5,7 @@ import ( "encoding/base64" "github.com/matrix-org/dendrite/internal/basecomponent" + "github.com/matrix-org/dendrite/serverkeyapi/api" "github.com/matrix-org/dendrite/serverkeyapi/internal" "github.com/matrix-org/dendrite/serverkeyapi/storage" "github.com/matrix-org/dendrite/serverkeyapi/storage/cache" @@ -15,7 +16,7 @@ import ( func SetupServerKeyAPIComponent( base *basecomponent.BaseDendrite, fedClient *gomatrixserverlib.FederationClient, -) *internal.ServerKeyAPI { +) api.ServerKeyInternalAPI { innerDB, err := storage.NewDatabase( string(base.Cfg.Database.ServerKey), base.Cfg.DbProperties(),