mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-15 10:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

patch dendrite microservices with bind config

Browse source 
Adds bind block to the dendrite config.
microservices bind to address in this block, and talk to other microservices via the address in the listen block
This commit is contained in:
Adit Sachde 2019-09-22 14:03:38 -04:00
parent 5e25f6ba22
commit 9e95d599bc
10 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/dendrite-appservice-server/main.go
View file

@ -35,5 +35,5 @@ func main() {
base, accountDB, deviceDB, federation, alias, query, cache,
)
base.SetupAndServeHTTP(string(base.Cfg.Listen.FederationSender))
base.SetupAndServeHTTP(string(base.Cfg.Bind.FederationSender))
}

2
cmd/dendrite-client-api-server/main.go
View file

@ -44,5 +44,5 @@ func main() {
alias, input, query, typingInputAPI, asQuery, transactions.New(),
)
base.SetupAndServeHTTP(string(base.Cfg.Listen.ClientAPI))
base.SetupAndServeHTTP(string(base.Cfg.Bind.ClientAPI))
}

2
cmd/dendrite-federation-api-server/main.go
View file

@ -39,5 +39,5 @@ func main() {
alias, input, query, asQuery,
)
base.SetupAndServeHTTP(string(base.Cfg.Listen.FederationAPI))
base.SetupAndServeHTTP(string(base.Cfg.Bind.FederationAPI))
}

2
cmd/dendrite-federation-sender-server/main.go
View file

@ -32,5 +32,5 @@ func main() {
base, federation, query,
)
base.SetupAndServeHTTP(string(base.Cfg.Listen.FederationSender))
base.SetupAndServeHTTP(string(base.Cfg.Bind.FederationSender))
}

2
cmd/dendrite-media-api-server/main.go
View file

@ -28,5 +28,5 @@ func main() {
mediaapi.SetupMediaAPIComponent(base, deviceDB)
base.SetupAndServeHTTP(string(base.Cfg.Listen.MediaAPI))
base.SetupAndServeHTTP(string(base.Cfg.Bind.MediaAPI))
}

2
cmd/dendrite-public-rooms-api-server/main.go
View file

@ -28,5 +28,5 @@ func main() {
publicroomsapi.SetupPublicRoomsAPIComponent(base, deviceDB)
base.SetupAndServeHTTP(string(base.Cfg.Listen.PublicRoomsAPI))
base.SetupAndServeHTTP(string(base.Cfg.Bind.PublicRoomsAPI))
}

2
cmd/dendrite-room-server/main.go
View file

@ -28,5 +28,5 @@ func main() {
roomserver.SetupRoomServerComponent(base)
base.SetupAndServeHTTP(string(base.Cfg.Listen.RoomServer))
base.SetupAndServeHTTP(string(base.Cfg.Bind.RoomServer))
}

2
cmd/dendrite-sync-api-server/main.go
View file

@ -31,5 +31,5 @@ func main() {
syncapi.SetupSyncAPIComponent(base, deviceDB, accountDB, query)
base.SetupAndServeHTTP(string(base.Cfg.Listen.SyncAPI))
base.SetupAndServeHTTP(string(base.Cfg.Bind.SyncAPI))
}

2
cmd/dendrite-typing-server/main.go
View file

@ -32,5 +32,5 @@ func main() {
typingserver.SetupTypingServerComponent(base, cache.NewTypingCache())
base.SetupAndServeHTTP(string(base.Cfg.Listen.TypingServer))
base.SetupAndServeHTTP(string(base.Cfg.Bind.TypingServer))
}

17
common/config/config.go
View file

@ -194,8 +194,7 @@ type Dendrite struct {
Password string `yaml:"turn_password"`
} `yaml:"turn"`
// The internal addresses the components will listen on.
// These should not be exposed externally as they expose metrics and debugging APIs.
// The addresses for talking to other microservices.
Listen struct {
MediaAPI Address `yaml:"media_api"`
ClientAPI Address `yaml:"client_api"`
@ -208,6 +207,20 @@ type Dendrite struct {
TypingServer Address `yaml:"typing_server"`
} `yaml:"listen"`
// The internal addresses the components will listen on.
// These should not be exposed externally as they expose metrics and debugging APIs.
Bind struct {
MediaAPI Address `yaml:"media_api"`
ClientAPI Address `yaml:"client_api"`
FederationAPI Address `yaml:"federation_api"`
AppServiceAPI Address `yaml:"appservice_api"`
SyncAPI Address `yaml:"sync_api"`
RoomServer Address `yaml:"room_server"`
FederationSender Address `yaml:"federation_sender"`
PublicRoomsAPI Address `yaml:"public_rooms_api"`
TypingServer Address `yaml:"typing_server"`
} `yaml:"bind"`
// The config for tracing the dendrite servers.
Tracing struct {
// The config for the jaeger opentracing reporter.