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

Add HTTPS listen and serve, and move both listen and serve to goroutines

Browse source
This commit is contained in:
Brendan Abolivier 2017-08-07 13:06:14 +01:00
parent 4d1504ee93
commit d7c7e87e14
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go
View file

@ -60,6 +60,8 @@ var (
configPath = flag.String("config", "dendrite.yaml", "The path to the config file. For more information, see the config file in this repository.")
httpBindAddr = flag.String("http-bind-address", ":8008", "The HTTP listening port for the server")
httpsBindAddr = flag.String("https-bind-address", ":8448", "The HTTPS listening port for the server")
certFile = flag.String("tls-cert", "", "The PEM formatted X509 certificate to use for TLS")
keyFile = flag.String("tls-key", "", "The PEM private key to use for TLS")
)
func main() {
@ -85,7 +87,18 @@ func main() {
m.setupAPIs()
// Expose the matrix APIs directly rather than putting them under a /api path.
log.Fatal(http.ListenAndServe(*httpBindAddr, m.api))
go func() {
log.Fatal(http.ListenAndServe(*httpBindAddr, m.api))
}()
// Handle HTTPS if certificate and key are provided
go func() {
if *certFile != "" && *keyFile != "" {
log.Fatal(http.ListenAndServeTLS(*httpsBindAddr, *certFile, *keyFile, m.api))
}
}()
// We want to block forever to let the HTTP and HTTPS handler serve the APIs
select {}
}
// A monolith contains all the dendrite components.