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

Don't use HTTP address for HTTPS whoops

Browse source
This commit is contained in:
Neil Alexander 2020-04-20 16:21:26 +01:00
parent 9736ce7bbf
commit b2b3e08565
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -102,11 +102,11 @@ func main() {
if *certFile != "" && *keyFile != "" { if *certFile != "" && *keyFile != "" {
go func() { go func() {
serv := http.Server{ serv := http.Server{
Addr: *httpBindAddr, Addr: *httpsBindAddr,
WriteTimeout: basecomponent.HTTPServerTimeout, WriteTimeout: basecomponent.HTTPServerTimeout,
} }
logrus.Info("Listening on ", *httpsBindAddr) logrus.Info("Listening on ", serv.Addr)
logrus.Fatal(serv.ListenAndServeTLS(*certFile, *keyFile)) logrus.Fatal(serv.ListenAndServeTLS(*certFile, *keyFile))
}() }()
} }

8
common/basecomponent/base.go
View file

@ -210,20 +210,20 @@ func (b *BaseDendrite) SetupAndServeHTTP(bindaddr string, listenaddr string) {
addr = listenaddr addr = listenaddr
} }
common.SetupHTTPAPI(http.DefaultServeMux, common.WrapHandlerInCORS(b.APIMux), b.Cfg)
logrus.Infof("Starting %s server on %s", b.componentName, addr)
serv := http.Server{ serv := http.Server{
Addr: addr, Addr: addr,
WriteTimeout: HTTPServerTimeout, WriteTimeout: HTTPServerTimeout,
} }
common.SetupHTTPAPI(http.DefaultServeMux, common.WrapHandlerInCORS(b.APIMux), b.Cfg)
logrus.Infof("Starting %s server on %s", b.componentName, serv.Addr)
err := serv.ListenAndServe() err := serv.ListenAndServe()
if err != nil { if err != nil {
logrus.WithError(err).Fatal("failed to serve http") logrus.WithError(err).Fatal("failed to serve http")
} }
logrus.Infof("Stopped %s server on %s", b.componentName, addr) logrus.Infof("Stopped %s server on %s", b.componentName, serv.Addr)
} }
// setupKafka creates kafka consumer/producer pair from the config. // setupKafka creates kafka consumer/producer pair from the config.