From 6eba7fea74fb2e5089e1a497d277cd732c2fb834 Mon Sep 17 00:00:00 2001
From: Omer Murat Yildirim <omermuratyildirim@gmail.com>
Date: Wed, 14 Apr 2021 12:15:58 +0300
Subject: [PATCH] set timeouts as config

---
 config.go                 |  6 ++++++
 dalga.go                  |  2 +-
 internal/server/server.go | 14 ++++++++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/config.go b/config.go
index 5620a80..b6446bc 100644
--- a/config.go
+++ b/config.go
@@ -34,6 +34,9 @@ var DefaultConfig = Config{
 		Host:            "127.0.0.1",
 		Port:            34006,
 		ShutdownTimeout: 10 * time.Second,
+		IdleTimeout:     60 * time.Second,
+		ReadTimeout:     10 * time.Second,
+		WriteTimeout:    10 * time.Second,
 	},
 	Endpoint: endpointConfig{
 		BaseURL: "http://127.0.0.1:5000/",
@@ -89,6 +92,9 @@ type listenConfig struct {
 	Host            string
 	Port            int
 	ShutdownTimeout time.Duration
+	IdleTimeout     time.Duration
+	ReadTimeout     time.Duration
+	WriteTimeout    time.Duration
 }
 
 func (c listenConfig) Addr() string {
diff --git a/dalga.go b/dalga.go
index ab0e4f7..31c7910 100644
--- a/dalga.go
+++ b/dalga.go
@@ -61,7 +61,7 @@ func New(config Config) (*Dalga, error) {
 	}
 	s := scheduler.New(t, i.ID(), config.Endpoint.BaseURL, config.Endpoint.Timeout, r, config.Jobs.RandomizationFactor, config.Jobs.ScanFrequency, config.Jobs.MaxRunning)
 	j := jobmanager.New(t, s)
-	srv := server.New(j, t, i.ID(), lis, config.Listen.ShutdownTimeout)
+	srv := server.New(j, t, i.ID(), lis, config.Listen.ShutdownTimeout, config.Listen.IdleTimeout, config.Listen.ReadTimeout, config.Listen.WriteTimeout)
 	return &Dalga{
 		config:    config,
 		db:        db,
diff --git a/internal/server/server.go b/internal/server/server.go
index 9099bcb..fff3114 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -18,6 +18,9 @@ import (
 
 type Server struct {
 	shutdownTimeout time.Duration
+	idleTimeout     time.Duration
+	readTimeout     time.Duration
+	writeTimeout    time.Duration
 	jobs            *jobmanager.JobManager
 	table           *table.Table
 	instanceID      uint32
@@ -26,9 +29,12 @@ type Server struct {
 	done            chan struct{}
 }
 
-func New(j *jobmanager.JobManager, t *table.Table, instanceID uint32, l net.Listener, shutdownTimeout time.Duration) *Server {
+func New(j *jobmanager.JobManager, t *table.Table, instanceID uint32, l net.Listener, shutdownTimeout, idleTimeout, readTimeout, writeTimeout time.Duration) *Server {
 	s := &Server{
 		shutdownTimeout: shutdownTimeout,
+		idleTimeout:     idleTimeout,
+		readTimeout:     readTimeout,
+		writeTimeout:    writeTimeout,
 		jobs:            j,
 		table:           t,
 		instanceID:      instanceID,
@@ -72,9 +78,9 @@ func (s *Server) createServer() http.Server {
 	m.Get("/status", http.HandlerFunc(s.handleStatus))
 	return http.Server{
 		Handler:      m,
-		ReadTimeout:  10 * time.Second,
-		WriteTimeout: 10 * time.Second,
-		IdleTimeout:  10 * time.Second,
+		ReadTimeout:  s.readTimeout,
+		WriteTimeout: s.writeTimeout,
+		IdleTimeout:  s.idleTimeout,
 	}
 }