1
Fork 0
mirror of https://github.com/jech/galene.git synced 2024-11-26 10:35:59 +01:00

Create webserver structure in main thread.

Avoids a race.
This commit is contained in:
Juliusz Chroboczek 2020-09-12 21:19:40 +02:00
parent 71022f4b58
commit 8d58571d4c

View file

@ -41,7 +41,6 @@ func webserver() {
http.HandleFunc("/public-groups.json", publicHandler) http.HandleFunc("/public-groups.json", publicHandler)
http.HandleFunc("/stats", statsHandler) http.HandleFunc("/stats", statsHandler)
go func() {
server = &http.Server{ server = &http.Server{
Addr: httpAddr, Addr: httpAddr,
ReadHeaderTimeout: 60 * time.Second, ReadHeaderTimeout: 60 * time.Second,
@ -54,6 +53,7 @@ func webserver() {
go g.shutdown("server is shutting down") go g.shutdown("server is shutting down")
} }
}) })
go func() {
var err error var err error
err = server.ListenAndServeTLS( err = server.ListenAndServeTLS(
filepath.Join(dataDir, "cert.pem"), filepath.Join(dataDir, "cert.pem"),