all repos — website @ 0e50089ea4b4bbd89c58c379b252baa2d09853ed

My website

set timeouts for secondary (http) server

Alan Pearce
commit

0e50089ea4b4bbd89c58c379b252baa2d09853ed

parent

f73b8d6770b0e3c3f6ccb50983083c2a4dc81a5f

1 file changed, 17 insertions(+), 9 deletions(-)

changed files
M internal/server/server.go → internal/server/server.go
@@ -46,9 +46,9 @@ }
 
 type Server struct {
 	*http.Server
-	redirectHandler func(http.ResponseWriter, *http.Request)
-	runtimeConfig   *Config
-	config          *cfg.Config
+	redirectServer *http.Server
+	runtimeConfig  *Config
+	config         *cfg.Config
 }
 
 func applyDevModeOverrides(config *cfg.Config, runtimeConfig *Config) {

@@ -178,14 +178,15 @@ if err != nil {
 		return nil, errors.Wrap(err, "could not create website mux")
 	}
 
-	redirectHandler := func(w http.ResponseWriter, r *http.Request) {
+	rMux := http.NewServeMux()
+	rMux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		path, _ := website.CanonicalisePath(r.URL.Path)
 		newURL := config.BaseURL.JoinPath(path)
 		http.Redirect(w, r, newURL.String(), 301)
-	}
+	})
 	if runtimeConfig.Redirect {
 		loggingMux.Handle(config.BaseURL.Hostname()+"/", mux)
-		loggingMux.HandleFunc("/", redirectHandler)
+		loggingMux.Handle("/", rMux)
 	} else {
 		loggingMux.Handle("/", mux)
 	}

@@ -209,9 +210,16 @@ IdleTimeout:       10 * time.Minute,
 			Addr:              listenAddress,
 			Handler:           top,
 		},
-		redirectHandler: redirectHandler,
-		config:          config,
-		runtimeConfig:   runtimeConfig,
+		redirectServer: &http.Server{
+			ReadHeaderTimeout: 10 * time.Second,
+			ReadTimeout:       1 * time.Minute,
+			WriteTimeout:      2 * time.Minute,
+			IdleTimeout:       10 * time.Minute,
+			Addr:              listenAddress,
+			Handler:           rMux,
+		},
+		config:        config,
+		runtimeConfig: runtimeConfig,
 	}, nil
 }