aboutsummaryrefslogtreecommitdiff
path: root/roomserver/roomserver.go
diff options
context:
space:
mode:
authorKegsay <kegan@matrix.org>2020-06-04 15:43:07 +0100
committerGitHub <noreply@github.com>2020-06-04 15:43:07 +0100
commit9834ac97db042b0c78fbd72652aa534129ca3afe (patch)
tree4fd862ffba61e47f94b2fcc5685a0502e21b3c70 /roomserver/roomserver.go
parentd785ad82b996989381657292fbd2c28b9fbb7df6 (diff)
Convert everything but serverkeyapi to inthttp (#1096)
* Convert roomserver to new inthttp format * Convert eduserver to new inthttp format * Convert appservice to new inthttp format
Diffstat (limited to 'roomserver/roomserver.go')
-rw-r--r--roomserver/roomserver.go7
1 files changed, 4 insertions, 3 deletions
diff --git a/roomserver/roomserver.go b/roomserver/roomserver.go
index 82934d50..ae0b0794 100644
--- a/roomserver/roomserver.go
+++ b/roomserver/roomserver.go
@@ -16,6 +16,7 @@ package roomserver
import (
"github.com/matrix-org/dendrite/roomserver/api"
+ "github.com/matrix-org/dendrite/roomserver/inthttp"
"github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/dendrite/internal/basecomponent"
@@ -38,7 +39,7 @@ func SetupRoomServerComponent(
logrus.WithError(err).Panicf("failed to connect to room server db")
}
- internalAPI := internal.RoomserverInternalAPI{
+ internalAPI := &internal.RoomserverInternalAPI{
DB: roomserverDB,
Cfg: base.Cfg,
Producer: base.KafkaProducer,
@@ -49,7 +50,7 @@ func SetupRoomServerComponent(
KeyRing: keyRing,
}
- internalAPI.SetupHTTP(base.InternalAPIMux)
+ inthttp.AddRoutes(internalAPI, base.InternalAPIMux)
- return &internalAPI
+ return internalAPI
}