aboutsummaryrefslogtreecommitdiff
path: root/cmd/dendrite-client-api-server
diff options
context:
space:
mode:
authorKegsay <kegan@matrix.org>2020-06-05 09:28:15 +0100
committerGitHub <noreply@github.com>2020-06-05 09:28:15 +0100
commit29a20d1da7a7f4a04d1e456d72e49424d45d5f4c (patch)
tree1869aaa85555b6c797e8b7990aec24c27ec5317b /cmd/dendrite-client-api-server
parent2bd12f635cef281ab0d497c9e1bafe92247d88d5 (diff)
General cleanup when making components (#1098)
* Remove ParseMonolith/LoadMonolith * cleanup which components need to be made
Diffstat (limited to 'cmd/dendrite-client-api-server')
-rw-r--r--cmd/dendrite-client-api-server/main.go7
1 files changed, 2 insertions, 5 deletions
diff --git a/cmd/dendrite-client-api-server/main.go b/cmd/dendrite-client-api-server/main.go
index 2eec84ab..8ad4231d 100644
--- a/cmd/dendrite-client-api-server/main.go
+++ b/cmd/dendrite-client-api-server/main.go
@@ -16,14 +16,12 @@ package main
import (
"github.com/matrix-org/dendrite/clientapi"
- "github.com/matrix-org/dendrite/eduserver"
- "github.com/matrix-org/dendrite/eduserver/cache"
"github.com/matrix-org/dendrite/internal/basecomponent"
"github.com/matrix-org/dendrite/internal/transactions"
)
func main() {
- cfg := basecomponent.ParseFlags()
+ cfg := basecomponent.ParseFlags(false)
base := basecomponent.NewBaseDendrite(cfg, "ClientAPI", true)
defer base.Close() // nolint: errcheck
@@ -38,8 +36,7 @@ func main() {
asQuery := base.AppserviceHTTPClient()
rsAPI := base.RoomserverHTTPClient()
fsAPI := base.FederationSenderHTTPClient()
- rsAPI.SetFederationSenderAPI(fsAPI)
- eduInputAPI := eduserver.SetupEDUServerComponent(base, cache.New(), deviceDB)
+ eduInputAPI := base.EDUServerClient()
clientapi.SetupClientAPIComponent(
base, deviceDB, accountDB, federation, keyRing,