feat(#33): use server timeouts from config, add defaults

eurofurence · Jul 14, 2024 · 6bc2504 · 6bc2504
1 parent e537f3d
commit 6bc2504
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/internal/config/defaults.go b/internal/config/defaults.go
@@ -4,4 +4,13 @@ func (c *Config) AddDefaults() {
 	if c.Server.Port == 0 {
 		c.Server.Port = 8081
 	}
+	if c.Server.IdleTimeout <= 0 {
+		c.Server.IdleTimeout = 30
+	}
+	if c.Server.ReadTimeout <= 0 {
+		c.Server.ReadTimeout = 30
+	}
+	if c.Server.WriteTimeout <= 0 {
+		c.Server.WriteTimeout = 30
+	}
 }
diff --git a/internal/web/server/server.go b/internal/web/server/server.go
@@ -50,10 +50,9 @@ func NewServer(conf *config.Config, baseCtx context.Context) Server {
 
 	s.ctx = baseCtx
 
-	// TODO should be in config so it is obvious what they are set to
-	s.idleTimeout = time.Minute
-	s.readTimeout = time.Minute
-	s.writeTimeout = time.Minute
+	s.idleTimeout = time.Duration(conf.Server.IdleTimeout) * time.Second
+	s.readTimeout = time.Duration(conf.Server.ReadTimeout) * time.Second
+	s.writeTimeout = time.Duration(conf.Server.WriteTimeout) * time.Second
 
 	s.host = conf.Server.BaseAddress
 	s.port = conf.Server.Port