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

change logic location

Browse source
This commit is contained in:
Adit Sachde 2019-10-01 12:38:05 -04:00
parent 619ece0c5c
commit 98aff17b12
10 changed files with 27 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -44,9 +44,6 @@ 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))
}
base.SetupAndServeHTTP(string(base.Cfg.Bind.ClientAPI), string(base.Cfg.Listen.ClientAPI))
}

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

@ -39,9 +39,6 @@ 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))
}
base.SetupAndServeHTTP(string(base.Cfg.Bind.FederationAPI), string(base.Cfg.Listen.FederationAPI))
}

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

@ -32,9 +32,6 @@ 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))
}
base.SetupAndServeHTTP(string(base.Cfg.Bind.FederationSender), string(base.Cfg.Listen.FederationSender))
}

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

@ -28,9 +28,6 @@ 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))
}
base.SetupAndServeHTTP(string(base.Cfg.Bind.MediaAPI), string(base.Cfg.Listen.MediaAPI))
}

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

@ -28,9 +28,6 @@ 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))
}
base.SetupAndServeHTTP(string(base.Cfg.Bind.PublicRoomsAPI), string(base.Cfg.Listen.PublicRoomsAPI))
}

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

@ -28,9 +28,6 @@ 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))
}
base.SetupAndServeHTTP(string(base.Cfg.Bind.RoomServer), string(base.Cfg.Listen.RoomServer))
}

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

@ -31,9 +31,6 @@ 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))
}
base.SetupAndServeHTTP(string(base.Cfg.Bind.SyncAPI), string(base.Cfg.Listen.SyncAPI))
}

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

@ -32,9 +32,6 @@ 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))
}
base.SetupAndServeHTTP(string(base.Cfg.Bind.TypingServer), string(base.Cfg.Listen.TypingServer))
}

10
common/basecomponent/base.go
View file

@ -150,7 +150,15 @@ func (b *BaseDendrite) CreateFederationClient() *gomatrixserverlib.FederationCli
// SetupAndServeHTTP sets up the HTTP server to serve endpoints registered on
// ApiMux under /api/ and adds a prometheus handler under /metrics.
func (b *BaseDendrite) SetupAndServeHTTP(addr string) {
func (b *BaseDendrite) SetupAndServeHTTP(bindaddr string, listenaddr string) {
var addr string
if bindaddr != "" {
addr = bindaddr
} else {
addr = listenaddr
}
common.SetupHTTPAPI(http.DefaultServeMux, common.WrapHandlerInCORS(b.APIMux))
logrus.Infof("Starting %s server on %s", b.componentName, addr)