Create webserver structure in main thread.

Avoids a race.

Create webserver structure in main thread.
Avoids a race.
8d58571d · Juliusz Chroboczek · 71022f4b · 8d58571d
Commit 8d58571d authored Sep 12, 2020 by Juliusz Chroboczek
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 12 deletions

webserver.go webserver.go +12 -12

No files found.
--- a/webserver.go
+++ b/webserver.go
@@ -41,19 +41,19 @@ func webserver() {
 	http.HandleFunc("/public-groups.json", publicHandler)
 	http.HandleFunc("/stats", statsHandler)
-	go func() {
+	server = &http.Server{
-		server = &http.Server{
+		Addr:              httpAddr,
-			Addr:              httpAddr,
+		ReadHeaderTimeout: 60 * time.Second,
-			ReadHeaderTimeout: 60 * time.Second,
+		IdleTimeout:       120 * time.Second,
-			IdleTimeout:       120 * time.Second,
+	}
+	server.RegisterOnShutdown(func() {
+		groups.mu.Lock()
+		defer groups.mu.Unlock()
+		for _, g := range groups.groups {
+			go g.shutdown("server is shutting down")
 		}
-		server.RegisterOnShutdown(func() {
+	})
-			groups.mu.Lock()
+	go func() {
-			defer groups.mu.Unlock()
-			for _, g := range groups.groups {
-				go g.shutdown("server is shutting down")
-			}
-		})
 		var err error
 		err = server.ListenAndServeTLS(
 			filepath.Join(dataDir, "cert.pem"),