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

Allow fallback if bind not specified

Browse source 
Allows fallback to listen block if bind block not specified
This commit is contained in:
Adit Sachde 2019-09-22 15:00:23 -04:00
parent 9e95d599bc
commit 619ece0c5c
10 changed files with 60 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,5 +35,9 @@ func main() {
base, accountDB, deviceDB, federation, alias, query, cache,
)
base.SetupAndServeHTTP(string(base.Cfg.Bind.FederationSender))
if base.Cfg.Bind.AppServiceAPI != "" {
base.SetupAndServeHTTP(string(base.Cfg.Bind.AppServiceAPI))
} else {
base.SetupAndServeHTTP(string(base.Cfg.Listen.AppServiceAPI))
}
}

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

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

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

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

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

@ -32,5 +32,9 @@ func main() {
base, federation, query,
)
if base.Cfg.Bind.FederationSender != "" {
base.SetupAndServeHTTP(string(base.Cfg.Bind.FederationSender))
} else {
base.SetupAndServeHTTP(string(base.Cfg.Listen.FederationSender))
}
}

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

@ -28,5 +28,9 @@ func main() {
mediaapi.SetupMediaAPIComponent(base, deviceDB)
if base.Cfg.Bind.MediaAPI != "" {
base.SetupAndServeHTTP(string(base.Cfg.Bind.MediaAPI))
} else {
base.SetupAndServeHTTP(string(base.Cfg.Listen.MediaAPI))
}
}

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

@ -28,5 +28,9 @@ func main() {
publicroomsapi.SetupPublicRoomsAPIComponent(base, deviceDB)
if base.Cfg.Bind.PublicRoomsAPI != "" {
base.SetupAndServeHTTP(string(base.Cfg.Bind.PublicRoomsAPI))
} else {
base.SetupAndServeHTTP(string(base.Cfg.Listen.PublicRoomsAPI))
}
}

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

@ -28,5 +28,9 @@ func main() {
roomserver.SetupRoomServerComponent(base)
if base.Cfg.Bind.RoomServer != "" {
base.SetupAndServeHTTP(string(base.Cfg.Bind.RoomServer))
} else {
base.SetupAndServeHTTP(string(base.Cfg.Listen.RoomServer))
}
}

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

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

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

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

29
common/config/config.go
View file

@ -194,6 +194,21 @@ 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.
// Falls back to addresses listed in Listen if not specified
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 addresses for talking to other microservices.
Listen struct {
MediaAPI Address `yaml:"media_api"`
@ -207,20 +222,6 @@ 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.