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

Wire in new server key API into hybrid monolith mode

Browse source
This commit is contained in:
Neil Alexander 2020-05-26 15:17:16 +01:00
parent 68f96d17a5
commit 6f8ebc173d
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/dendrite-monolith-server/main.go
View file

@ -72,6 +72,9 @@ func main() {
serverKeyAPI := serverkeyapi.SetupServerKeyAPIComponent( serverKeyAPI := serverkeyapi.SetupServerKeyAPIComponent(
base, federation, base, federation,
) )
if base.EnableHTTPAPIs {
serverKeyAPI = base.CreateHTTPServerKeyAPIs()
}
keyRing := serverKeyAPI.KeyRing() keyRing := serverKeyAPI.KeyRing()
rsComponent := roomserver.SetupRoomServerComponent( rsComponent := roomserver.SetupRoomServerComponent(

3
serverkeyapi/serverkeyapi.go
View file

@ -5,6 +5,7 @@ import (
"encoding/base64" "encoding/base64"
"github.com/matrix-org/dendrite/internal/basecomponent" "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/internal"
"github.com/matrix-org/dendrite/serverkeyapi/storage" "github.com/matrix-org/dendrite/serverkeyapi/storage"
"github.com/matrix-org/dendrite/serverkeyapi/storage/cache" "github.com/matrix-org/dendrite/serverkeyapi/storage/cache"
@ -15,7 +16,7 @@ import (
func SetupServerKeyAPIComponent( func SetupServerKeyAPIComponent(
base *basecomponent.BaseDendrite, base *basecomponent.BaseDendrite,
fedClient *gomatrixserverlib.FederationClient, fedClient *gomatrixserverlib.FederationClient,
) *internal.ServerKeyAPI { ) api.ServerKeyInternalAPI {
innerDB, err := storage.NewDatabase( innerDB, err := storage.NewDatabase(
string(base.Cfg.Database.ServerKey), string(base.Cfg.Database.ServerKey),
base.Cfg.DbProperties(), base.Cfg.DbProperties(),