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

Restore original HTTP listener in monolith

Browse source
This commit is contained in:
Neil Alexander 2020-04-20 15:10:38 +01:00
parent 8e67534959
commit 6c1c12b238
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,6 @@ package main
import (
"flag"
"net/http"
"time"
"github.com/matrix-org/dendrite/appservice"
"github.com/matrix-org/dendrite/clientapi"
@ -92,14 +91,7 @@ func main() {
// Expose the matrix APIs directly rather than putting them under a /api path.
go func() {
logrus.Info("Listening on ", *httpBindAddr)
serv := http.Server{
Addr: *httpBindAddr,
ReadTimeout: time.Second * 300,
ReadHeaderTimeout: time.Second * 300,
WriteTimeout: time.Second * 300,
IdleTimeout: time.Second * 300,
}
logrus.Fatal(serv.ListenAndServe())
logrus.Fatal(http.ListenAndServe(*httpBindAddr, nil))
}()
// Handle HTTPS if certificate and key are provided
go func() {